Grouped the Fortran constants in Doxygen (#2136)

6 files changed, 104 insertions, 67 deletions

diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
index 02db15f..c17ee9c 100644
--- a/fortran/src/H5Aff.F90
+++ b/fortran/src/H5Aff.F90
@@ -1340,7 +1340,7 @@ CONTAINS
 !!
 !! \brief Writes data to an attribute.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param attr_id     Identifier of an attribute to write.
 !! \param memtype_id  Identifier of the attribute datatype (in memory).
@@ -1361,7 +1361,7 @@ CONTAINS
 !!
 !! \brief Writes data to an attribute.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param attr_id     Identifier of an attribute to write.
 !! \param memtype_id  Identifier of the attribute datatype (in memory).
@@ -1384,7 +1384,7 @@ CONTAINS
 !!
 !! \brief Reads an attribute.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param attr_id     Identifier of an attribute to read.
 !! \param memtype_id  Identifier of the attribute datatype (in memory).
@@ -1405,7 +1405,7 @@ CONTAINS
 !!
 !! \brief Reads an attribute.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param attr_id     Identifier of an attribute to read.
 !! \param memtype_id  Identifier of the attribute datatype (in memory).
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index c4134e8..0da0092 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -1098,7 +1098,7 @@ CONTAINS
 !!
 !! \brief Writes raw data from a dataset into a buffer.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param dset_id       Identifier of the dataset to write to.
 !! \param mem_type_id   Identifier of the memory datatype.
@@ -1126,7 +1126,7 @@ CONTAINS
 !!
 !! \brief Reads raw data from a dataset into a buffer (Passes Pointer).
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param dset_id       Identifier of the dataset read from.
 !! \param mem_type_id   Identifier of the memory datatype.
@@ -1158,7 +1158,7 @@ CONTAINS
 !!        \li h5dwrite_f Purpose: Writes data other than variable-length data.
 !!        \li h5dwrite_vl_f Purpose: Writes variable-length data.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param dset_id       Identifier of the dataset to write to.
 !! \param mem_type_id   Identifier of the memory datatype.
@@ -1189,7 +1189,7 @@ CONTAINS
 !!        \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.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param dset_id       Identifier of the dataset read from.
 !! \param mem_type_id   Identifier of the memory datatype.
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 82eaaf5..40c0a92 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -4152,7 +4152,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Sets fill value for a dataset creation property list
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param prp_id    Property list identifier.
 !! \param type_id   Datatype identifier of fill value datatype (in memory).
@@ -4173,7 +4173,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Gets fill value for a dataset creation property list
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param prp_id    Property list identifier.
 !! \param type_id   Datatype identifier of fill value datatype (in memory).
@@ -4194,7 +4194,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Sets fill value for a dataset creation property list
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param prp_id    Property list identifier.
 !! \param type_id   Datatype identifier of fill value datatype (in memory).
@@ -4215,7 +4215,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Gets fill value for a dataset creation property list.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param prp_id    Property list identifier.
 !! \param type_id   Datatype identifier of fill value datatype (in memory).
@@ -4236,7 +4236,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Sets a property list value.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param prp_id Property list identifier to modify.
 !! \param name   Name of property to modify.
@@ -4257,7 +4257,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Sets a property list value.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param prp_id Property list identifier to modify.
 !! \param name   Name of property to modify.
@@ -4282,7 +4282,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Sets a property list value.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param prp_id Property list identifier to modify.
 !! \param name   Name of property to modify.
@@ -4306,7 +4306,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Queries the value of a property.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param prp_id Property list identifier to modify.
 !! \param name   Name of property to get.
@@ -4327,7 +4327,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Queries the value of a property.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param prp_id Property list identifier to modify.
 !! \param name   Name of property to get.
@@ -4351,7 +4351,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Registers a permanent property with a property list class.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param class Property list class identifier.
 !! \param name  Name of property to register.
@@ -4373,7 +4373,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Registers a permanent property with a property list class.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param class Property list class identifier.
 !! \param name  Name of property to register.
@@ -4400,7 +4400,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Registers a temporary property with a property list class.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param plist  Property list class identifier.
 !! \param name   Name of property to insert.
@@ -4423,7 +4423,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!
 !! \brief Registers a temporary property with a property list class.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param plist  Property list class identifier.
 !! \param name   Name of property to insert.
diff --git a/fortran/src/H5Rff.F90 b/fortran/src/H5Rff.F90
index eefc447..f55014f 100644
--- a/fortran/src/H5Rff.F90
+++ b/fortran/src/H5Rff.F90
@@ -167,7 +167,7 @@ CONTAINS
 !!
 !! \brief Retrieves the type of object that an object reference points to.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param dset_id  Identifier of the dataset containing reference to the objects.
 !! \param ref      Reference to open.
@@ -215,7 +215,7 @@ CONTAINS
 !!
 !! \brief Retrieves a dataspace with the specified region selected.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param dset_id  Identifier of the dataset containing reference to the regions.
 !! \param ref      Reference to open.
@@ -251,7 +251,7 @@ CONTAINS
 !!
 !! \brief Retrieves a dataspace with the specified region selected using pointer.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param dset_id  Identifier of the dataset containing reference to the regions.
 !! \param ref      Reference to open.
@@ -285,7 +285,7 @@ CONTAINS
 !!
 !! \brief Creates reference to the object.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param loc_id Location identifier.
 !! \param name   Name of the object at the specified location.
@@ -317,7 +317,7 @@ CONTAINS
 !!
 !! \brief Creates reference to the dataset region
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param loc_id   Location identifier.
 !! \param name     Name of the dataset at the specified location.
@@ -362,7 +362,7 @@ CONTAINS
 !!
 !! \brief Creates a reference.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param loc_id   Location identifier.
 !! \param name     Name of the dataset at the specified location.
@@ -407,7 +407,7 @@ CONTAINS
 !!
 !! \brief Opens the HDF5 object referenced
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param obj_id     Identifier of the dataset containing reference.
 !! \param ref        Reference to open.
@@ -433,7 +433,7 @@ CONTAINS
 !!
 !! \brief Opens the dataset region
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param obj_id     Object identifier.
 !! \param ref        Reference to open.
@@ -459,7 +459,7 @@ CONTAINS
 !!
 !! \brief Opens the HDF5 object referenced.
 !!
-!! \note  \fortran_approved
+!! \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.
@@ -485,7 +485,7 @@ CONTAINS
 !!
 !! \brief Retrieves a name of a referenced object.
 !!
-!! \note  \fortran_obsolete
+!! \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.
@@ -521,7 +521,7 @@ CONTAINS
 !!
 !! \brief Retrieves a name of a dataset region.
 !!
-!! \note  \fortran_obsolete
+!! \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.
@@ -556,7 +556,7 @@ CONTAINS
 !!
 !! \brief Retrieves a name of a referenced object.
 !!
-!! \note  \fortran_approved
+!! \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.
diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90
index 36a35be..bb088f5 100644
--- a/fortran/src/H5Tff.F90
+++ b/fortran/src/H5Tff.F90
@@ -2081,7 +2081,7 @@ CONTAINS
 !!
 !! \brief Inserts a new enumeration datatype member.
 !!
-!! \note \fortran_approved
+!! \attention \fortran_approved
 !!
 !! \param type_id Datatype identifier for the enumeration datatype.
 !! \param name    Datatype identifier.
@@ -2129,7 +2129,7 @@ CONTAINS
 !!
 !! \brief Inserts a new enumeration datatype member.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param type_id Datatype identifier for the enumeration datatype.
 !! \param name    Datatype identifier.
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 2eaad7f..12e40bf 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -1,9 +1,6 @@
-!> @defgroup FH5GLOBAL Fortran global constants.
-!!
-
-!> @ingroup FH5GLOBAL
-!!
-!! @brief This module contains Fortran datatypes and flags.
+! PURPOSE
+!
+! This module contains Fortran datatypes and flags.
 !
 ! USES
 !  H5FORTRAN_TYPES - H5FORTRAN_TYPES is generated at run time by H5match_types.c
@@ -36,21 +33,26 @@ MODULE H5GLOBAL
   ENUM, BIND(C)
     ENUMERATOR :: enum_dtype
   END ENUM
-  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
-  ! 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 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
@@ -60,11 +62,7 @@ MODULE H5GLOBAL
   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
+!> @}
 
   ! Do not forget to change these values when new predefined
   ! datatypes are added
@@ -127,7 +125,8 @@ MODULE H5GLOBAL
   !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
@@ -173,11 +172,14 @@ MODULE H5GLOBAL
   INTEGER(HID_T) :: H5T_FORTRAN_S1  !< H5T_FORTRAN_S1
   INTEGER(HID_T) :: H5T_C_S1     !< H5T_C_S1
 
+#ifndef H5_DOXYGEN_FORTRAN
   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
   !
@@ -193,7 +195,8 @@ MODULE H5GLOBAL
   !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
@@ -205,6 +208,7 @@ MODULE H5GLOBAL
   INTEGER :: H5_ITER_N_F          !< H5_ITER_N
 
   INTEGER(HADDR_T) :: HADDR_UNDEF_F  !< HADDR_UNDEF
+!> @}
   !
   ! H5F flags declaration
   !
@@ -235,7 +239,8 @@ MODULE H5GLOBAL
   !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
@@ -261,6 +266,7 @@ MODULE H5GLOBAL
   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
   !
@@ -280,7 +286,8 @@ MODULE H5GLOBAL
   !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
@@ -295,6 +302,7 @@ MODULE H5GLOBAL
   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
   !
@@ -331,7 +339,8 @@ MODULE H5GLOBAL
   !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
@@ -374,6 +383,7 @@ MODULE H5GLOBAL
   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
   !
@@ -384,12 +394,14 @@ MODULE H5GLOBAL
   !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
   !
@@ -454,7 +466,8 @@ MODULE H5GLOBAL
   !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
@@ -472,6 +485,7 @@ MODULE H5GLOBAL
   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
@@ -484,13 +498,15 @@ MODULE H5GLOBAL
   !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
   !
@@ -530,6 +546,14 @@ MODULE H5GLOBAL
   !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
@@ -565,6 +589,7 @@ MODULE H5GLOBAL
   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
   !
@@ -590,7 +615,8 @@ MODULE H5GLOBAL
   !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
@@ -612,6 +638,7 @@ MODULE H5GLOBAL
 
   INTEGER :: H5P_CRT_ORDER_INDEXED_F  !< H5P_CRT_ORDER_INDEXED
   INTEGER :: H5P_CRT_ORDER_TRACKED_F  !< H5P_CRT_ORDER_TRACKED
+!> @}
   !
   ! H5R flags declaration
   !
@@ -619,9 +646,11 @@ MODULE H5GLOBAL
   !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
   !
@@ -647,7 +676,8 @@ MODULE H5GLOBAL
   !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
@@ -672,6 +702,7 @@ MODULE H5GLOBAL
   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
   !
@@ -712,7 +743,8 @@ MODULE H5GLOBAL
   !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
@@ -748,6 +780,7 @@ MODULE H5GLOBAL
   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
   !
@@ -773,7 +806,8 @@ MODULE H5GLOBAL
   !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
@@ -794,6 +828,7 @@ MODULE H5GLOBAL
   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
   !
@@ -801,9 +836,11 @@ MODULE H5GLOBAL
   !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