Added C references to Fortran constants. (#2126)

* added C references for Fortran APIs

1 files changed, 325 insertions, 423 deletions

diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index eb3b87e..2eaad7f 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -1,24 +1,12 @@
-!****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.
+!> @defgroup FH5GLOBAL Fortran global constants.
+!!
+
+!> @ingroup FH5GLOBAL
+!!
+!! @brief This module contains Fortran datatypes and flags.
 !
 ! USES
-!  H5FORTRAN_TYPES 	 - This module is generated at run time. See
+!  H5FORTRAN_TYPES - H5FORTRAN_TYPES is generated at run time by H5match_types.c
 !
 ! COPYRIGHT
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -48,7 +36,7 @@ MODULE H5GLOBAL
   ENUM, BIND(C)
     ENUMERATOR :: enum_dtype
   END ENUM
-  INTEGER, PARAMETER :: ENUM_T = KIND(enum_dtype)
+  INTEGER, PARAMETER :: ENUM_T = KIND(enum_dtype)  !< Enumerate data type that is interoperable with C.
 
   ! Definitions for reference datatypes.
   ! If you change the value of these parameters, do not forget to change corresponding
@@ -60,17 +48,20 @@ MODULE H5GLOBAL
   ! 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
+  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()
 
+!> @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
 
+!> @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
@@ -137,56 +128,56 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_FLOAT_128
   !DEC$endif
 
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_FLOAT
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_DOUBLE
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_LONG_DOUBLE
-  INTEGER(HID_T) :: H5T_NATIVE_INTEGER
-  INTEGER(HID_T) :: H5T_NATIVE_REAL
-  INTEGER(HID_T) :: H5T_NATIVE_DOUBLE
-  INTEGER(HID_T) :: H5T_NATIVE_CHARACTER
-  INTEGER(HID_T) :: H5T_STD_REF_OBJ
-  INTEGER(HID_T) :: H5T_STD_REF_DSETREG
-  INTEGER(HID_T) :: H5T_IEEE_F32BE
-  INTEGER(HID_T) :: H5T_IEEE_F32LE
-  INTEGER(HID_T) :: H5T_IEEE_F64BE
-  INTEGER(HID_T) :: H5T_IEEE_F64LE
-  INTEGER(HID_T) :: H5T_STD_I8BE
-  INTEGER(HID_T) :: H5T_STD_I8LE
-  INTEGER(HID_T) :: H5T_STD_I16BE
-  INTEGER(HID_T) :: H5T_STD_I16LE
-  INTEGER(HID_T) :: H5T_STD_I32BE
-  INTEGER(HID_T) :: H5T_STD_I32LE
-  INTEGER(HID_T) :: H5T_STD_I64BE
-  INTEGER(HID_T) :: H5T_STD_I64LE
-  INTEGER(HID_T) :: H5T_STD_U8BE
-  INTEGER(HID_T) :: H5T_STD_U8LE
-  INTEGER(HID_T) :: H5T_STD_U16BE
-  INTEGER(HID_T) :: H5T_STD_U16LE
-  INTEGER(HID_T) :: H5T_STD_U32BE
-  INTEGER(HID_T) :: H5T_STD_U32LE
-  INTEGER(HID_T) :: H5T_STD_U64BE
-  INTEGER(HID_T) :: H5T_STD_U64LE
-  INTEGER(HID_T) :: H5T_STRING
-  INTEGER(HID_T) :: H5T_STD_B8BE
-  INTEGER(HID_T) :: H5T_STD_B8LE
-  INTEGER(HID_T) :: H5T_STD_B16BE
-  INTEGER(HID_T) :: H5T_STD_B16LE
-  INTEGER(HID_T) :: H5T_STD_B32BE
-  INTEGER(HID_T) :: H5T_STD_B32LE
-  INTEGER(HID_T) :: H5T_STD_B64BE
-  INTEGER(HID_T) :: H5T_STD_B64LE
-  INTEGER(HID_T) :: H5T_NATIVE_B8
-  INTEGER(HID_T) :: H5T_NATIVE_B16
-  INTEGER(HID_T) :: H5T_NATIVE_B32
-  INTEGER(HID_T) :: H5T_NATIVE_B64
-  INTEGER(HID_T) :: H5T_FORTRAN_S1
-  INTEGER(HID_T) :: H5T_C_S1
+  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
 
   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
-
-  INTEGER(HID_T) :: H5T_NATIVE_FLOAT_128 ! NEED IFDEF -MSB-
+  ! NEED IFDEF -MSB-
+  INTEGER(HID_T) :: H5T_NATIVE_FLOAT_128 !< Quadruple-precision floating-point
   !
   ! H5generic flags declaration
   !
@@ -203,17 +194,17 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: HADDR_UNDEF_F
   !DEC$endif
 
-  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
-
-  INTEGER(HADDR_T) :: HADDR_UNDEF_F
+  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
   !
@@ -245,31 +236,31 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V114_F
   !DEC$endif
 
-  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
-  INTEGER :: H5F_LIBVER_ERROR_F
-  INTEGER :: H5F_LIBVER_NBOUNDS_F
-  INTEGER :: H5F_LIBVER_V18_F
-  INTEGER :: H5F_LIBVER_V110_F
-  INTEGER :: H5F_LIBVER_V112_F
-  INTEGER :: H5F_LIBVER_V114_F
+  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
   !
@@ -290,20 +281,20 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_DENSE_F
   !DEC$endif
 
-  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
+  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
   !
@@ -341,48 +332,48 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5D_VIRTUAL_F
   !DEC$endif
 
-  INTEGER :: H5D_COMPACT_F
-  INTEGER :: H5D_CONTIGUOUS_F
-  INTEGER :: H5D_CHUNKED_F
+  INTEGER :: H5D_COMPACT_F  !< H5D_COMPACT
+  INTEGER :: H5D_CONTIGUOUS_F  !< H5D_CONTIGUOUS
+  INTEGER :: H5D_CHUNKED_F  !< H5D_CHUNKED
 
-  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_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
-  INTEGER :: H5D_SPACE_STS_NOT_ALLOCATED_F
-  INTEGER :: H5D_SPACE_STS_PART_ALLOCATED_F
-  INTEGER :: H5D_SPACE_STS_ALLOCATED_F
+  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
-  INTEGER :: H5D_FILL_TIME_ALLOC_F
-  INTEGER :: H5D_FILL_TIME_NEVER_F
+  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
-  INTEGER :: H5D_FILL_VALUE_UNDEFINED_F
-  INTEGER :: H5D_FILL_VALUE_DEFAULT_F
-  INTEGER :: H5D_FILL_VALUE_USER_DEFINED_F
+  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
+  ! 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
+  ! 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
-  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
-  INTEGER :: H5D_VDS_ERROR_F
-  INTEGER :: H5D_VDS_FIRST_MISSING_F
-  INTEGER :: H5D_VDS_LAST_AVAILABLE_F
-  INTEGER :: H5D_VIRTUAL_F
+  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
   !
@@ -394,11 +385,11 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5E_WALK_DOWNWARD_F
   !DEC$endif
 
-  INTEGER(HID_T) :: H5E_DEFAULT_F
-  INTEGER :: H5E_MAJOR_F
-  INTEGER :: H5E_MINOR_F
-  INTEGER :: H5E_WALK_UPWARD_F
-  INTEGER :: H5E_WALK_DOWNWARD_F
+  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
   !
@@ -423,24 +414,24 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5FD_STDIO_F
   !DEC$endif
 
-  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
-  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
+  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(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
   !
   ! H5I flags declaration
   !
@@ -464,23 +455,23 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5I_INVALID_HID_F
   !DEC$endif
 
-  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
-  INTEGER :: H5I_UNINIT_F
-  INTEGER :: H5I_VFL_F
-  INTEGER :: H5I_VOL_F
-  INTEGER :: H5I_GENPROP_CLS_F
-  INTEGER :: H5I_GENPROP_LST_F
-  INTEGER :: H5I_ERROR_CLASS_F
-  INTEGER :: H5I_ERROR_MSG_F
-  INTEGER :: H5I_ERROR_STACK_F
-  INTEGER :: H5I_NTYPES_F
-  INTEGER :: H5I_INVALID_HID_F
+  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
@@ -494,12 +485,12 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5L_LINK_CLASS_T_VERS_F
   !DEC$endif
 
-  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
+  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
   !
@@ -539,40 +530,41 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_META_SIZE_F
   !
   !DEC$endif
-
-  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
+  ! *** 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
-  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
-  INTEGER :: H5O_INFO_ALL_F
-  INTEGER :: H5O_INFO_BASIC_F
-  INTEGER :: H5O_INFO_TIME_F
-  INTEGER :: H5O_INFO_NUM_ATTRS_F
-  INTEGER :: H5O_INFO_HDR_F
-  INTEGER :: H5O_INFO_META_SIZE_F
+  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
   !
@@ -599,27 +591,27 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5P_CRT_ORDER_TRACKED_F
   !DEC$endif
 
-  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
-
-  INTEGER :: H5P_CRT_ORDER_INDEXED_F
-  INTEGER :: H5P_CRT_ORDER_TRACKED_F
+  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
   !
@@ -628,8 +620,8 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5R_DATASET_REGION_F
   !DEC$endif
 
-  INTEGER :: H5R_OBJECT_F
-  INTEGER :: H5R_DATASET_REGION_F
+  INTEGER :: H5R_OBJECT_F  !< H5R_OBJECT
+  INTEGER :: H5R_DATASET_REGION_F  !< H5R_DATASET_REGION
   !
   ! H5S flags declaration
   !
@@ -656,30 +648,30 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_ALL_F
   !DEC$endif
 
-  INTEGER(HSIZE_T) :: H5S_UNLIMITED_F
-
-  INTEGER(HID_T) :: H5S_ALL_F
-
-  INTEGER :: H5S_SCALAR_F
-  INTEGER :: H5S_SIMPLE_F
-  INTEGER :: H5S_NULL_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
+  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
   !
@@ -721,41 +713,41 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5T_DIR_DESCEND_F
   !DEC$endif
 
-  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
+  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
   !
@@ -782,26 +774,26 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_INT_MINBITS_DEFAULT_F
   !DEC$endif
 
-  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
+  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
   !
@@ -810,98 +802,8 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_NN_OM_F
   !DEC$endif
 
-  INTEGER :: H5_SZIP_EC_OM_F
-  INTEGER :: H5_SZIP_NN_OM_F
-
-CONTAINS
-
-  ! Copy a c string to a Fortran string
-
-  SUBROUTINE H5_Fortran_string_c2f(c_string, f_string)
-
-    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR, C_NULL_CHAR
-    IMPLICIT NONE
-    CHARACTER(KIND=C_CHAR, LEN=*), INTENT(IN) :: c_string
-    CHARACTER(LEN=*), INTENT(OUT) :: f_string
-    INTEGER(SIZE_T) :: c_len, f_len
-
-    ! Find the length of the C string by locating the null terminator
-    c_len = MAX(INDEX(c_string,C_NULL_CHAR, KIND=SIZE_T)-1_SIZE_T,1_SIZE_T)
-    ! Find the length of the Fortran string
-    f_len = LEN(f_string)
-
-    ! CASE (1): C string is equal to or larger than Fortran character buffer,
-    !           so fill the entire Fortran buffer.
-    IF(c_len.GE.f_len)THEN !
-       f_string(1:f_len) = c_string(1:f_len)
-
-    ! CASE (2): C string is smaller than Fortran character buffer,
-    !           so copy C string and blank pad remaining characters.
-    ELSE
-       f_string(1:c_len) = c_string(1:c_len)
-       f_string(c_len+1:f_len) =' '
-    ENDIF
-  END SUBROUTINE H5_Fortran_string_c2f
-
-  SUBROUTINE H5_Fortran_string_f2c(f_string, c_string)
-
-    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR, C_NULL_CHAR
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: f_string
-    CHARACTER(KIND=C_CHAR, LEN=*), INTENT(OUT) :: c_string
-
-    c_string = TRIM(f_string)//C_NULL_CHAR
-
-  END SUBROUTINE H5_Fortran_string_f2c
-
-
-! Copy Fortran string to C character array, assuming the C array is one-char
-! longer for the terminating null char.
-! fstring : the Fortran input string
-! cstring : the C output string (with memory already allocated)
-!!$subroutine MPIR_Fortran_string_f2c(fstring, cstring)
-!!$    implicit none
-!!$    character(len=*), intent(in) :: fstring
-!!$    character(kind=c_char), intent(out) :: cstring(:)
-!!$    integer :: i, j
-!!$    logical :: met_non_blank
-!!$
-!!$    ! Trim the leading and trailing blank characters
-!!$    j = 1
-!!$    met_non_blank = .false.
-!!$    do i = 1, len_trim(fstring)
-!!$        if (met_non_blank) then
-!!$            cstring(j) = fstring(i:i)
-!!$            j = j + 1
-!!$        else if (fstring(i:i) /= ' ') then
-!!$            met_non_blank = .true.
-!!$            cstring(j) = fstring(i:i)
-!!$            j = j + 1
-!!$        end if
-!!$    end do
-!!$
-!!$    cstring(j) = C_NULL_CHAR
-!!$end subroutine MPIR_Fortran_string_f2c
-!!$
-!!$! Copy C character array to Fortran string
-!!$subroutine MPIR_Fortran_string_c2f(cstring, fstring)
-!!$    implicit none
-!!$    character(kind=c_char), intent(in) :: cstring(:)
-!!$    character(len=*), intent(out) :: fstring
-!!$    integer :: i, j, length
-!!$
-!!$    i = 1
-!!$    do while (cstring(i) /= C_NULL_CHAR)
-!!$        fstring(i:i) = cstring(i)
-!!$        i = i + 1
-!!$    end do
-!!$
-!!$    ! Zero out the trailing characters
-!!$    length = len(fstring)
-!!$    do j = i, length
-!!$        fstring(j:j) = ' '
-!!$    end do
-!!$end subroutine MPIR_Fortran_string_c2f
+  INTEGER :: H5_SZIP_EC_OM_F  !< H5_SZIP_EC_OM
+  INTEGER :: H5_SZIP_NN_OM_F  !< H5_SZIP_NN_OM
 
 END MODULE H5GLOBAL