[svn-r22827] HDFFV-8007: Add missing H5O Fortran functions.

Tested: jam(gnu,intel)
 

8 files changed, 1310 insertions, 83 deletions

diff --git a/fortran/src/H5Gff.f90 b/fortran/src/H5Gff.f90
index 6bcee7c..155185a 100644
--- a/fortran/src/H5Gff.f90
+++ b/fortran/src/H5Gff.f90
@@ -927,7 +927,7 @@ CONTAINS
                                            ! Buffer to hold a comment
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 !*****
-    INTEGER :: namelen ! Lenghth of the current_name string
+    INTEGER :: namelen ! Length of the current_name string
 
     INTERFACE
        INTEGER FUNCTION h5gget_comment_c(loc_id, name, namelen, size, buffer)
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index 531f09c..59f9a3d 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -24,6 +24,84 @@
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
+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;
+
+}
+
 /****if* H5Of/h5olink_c
  * NAME
  *  h5olink_c
@@ -215,7 +293,7 @@ nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id)
   return ret_value;
 }
 
-/* ***if* H5Of/H5Oget_info_by_name_c
+/****if* H5Of/H5Oget_info_by_name_c
  * NAME
  *  H5Oget_info_by_name_c
  * PURPOSE
@@ -226,10 +304,7 @@ nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id)
  *  namelen      - 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.
+ *  object_info  - Buffer in which to return object information.
  *
  * RETURNS
  *  0 on success, -1 on failure
@@ -261,74 +336,100 @@ nh5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *
 			 &Oinfo, (hid_t)*lapl_id) < 0)
     HGOTO_DONE(FAIL);
 
-  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;
+  ret_value = fill_h5o_info_t_f(Oinfo,object_info);
 
-  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) */
+ done:
+  if(c_name)
+    HDfree(c_name);
+  return ret_value;
+}
 
-  ts = HDgmtime(&Oinfo.mtime);
+/****if* H5Of/H5Oget_info_by_idx_c
+ * NAME
+ *  H5Oget_info_by_idx_c
+ * PURPOSE
+ *  Calls H5Oget_info_by_idx
+ * INPUTS
+ *  loc_id       - File or group identifier specifying location of group in which object is located.
+ *  name         - Name of group, relative to loc_id.
+ *  namelen      - Name length.
+ *  lapl_id      - Link access property list.
+ * OUTPUTS
+ *  object_info  - Buffer in which to return object information.
+ *
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  December 1, 2008
+ * SOURCE
+*/
+int_f
+nh5oget_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)
+/******/
+{
+  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);
 
-  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) */
+  c_index_field = (H5_index_t)*index_field;
+  c_order = (H5_iter_order_t)*order;
 
-  object_info->num_attrs = (hsize_t_f)Oinfo.num_attrs;
+  /*
+   * 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);
 
-  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;
+  ret_value = fill_h5o_info_t_f(Oinfo,object_info);
 
-  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;
+ done:
+  if(c_group_name)
+    HDfree(c_group_name);
+  return ret_value;
+}
 
-  object_info->hdr.mesg.present = Oinfo.hdr.mesg.present;
-  object_info->hdr.mesg.shared  = Oinfo.hdr.mesg.shared;
+/****if* H5Of/H5Oget_info_c
+ * NAME
+ *  H5Oget_info_c
+ * PURPOSE
+ *  Calls H5Oget_info
+ * INPUTS
+ *  object_id   - Identifier for target object.
+ * OUTPUTS
+ *  object_info - Buffer in which to return object information.
+ *
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  May 16, 2012
+ * SOURCE
+*/
+int_f
+nh5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info)
+/******/
+{
+  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);
 
-  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;
+  ret_value = fill_h5o_info_t_f(Oinfo,object_info);
 
  done:
   return ret_value;
@@ -391,3 +492,428 @@ nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
   return ret_value;
 
 }
+
+/****if* H5Of/h5ovisit_by_name_c
+ * NAME
+ *  h5ovisit_by_name_c
+ * 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
+ *
+ * OUTPUTS
+ *          idx - Position at which an interrupted iteration may be restarted
+ *
+ * RETURNS
+ *     >0 on success, 0< on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  May 16, 2012
+ * SOURCE
+*/
+int_f
+nh5ovisit_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 )
+/******/
+{
+  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;
+
+}
+
+/****if* H5Of/h5odecr_refcount_c
+ * NAME
+ *  h5odecr_refcount_c
+ * PURPOSE
+ *  Calls H5Odecr_refcount
+ * INPUTS
+ *  object_id - Object identifier.
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  May 16, 2012
+ * SOURCE
+*/
+int_f
+nh5odecr_refcount_c (hid_t_f *object_id)
+/******/
+{
+  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);
+
+ done:
+  return ret_value;
+}
+
+/****if* H5Of/h5oexists_by_name_c
+ * NAME
+ *  h5oexists_by_name_c
+ * PURPOSE
+ *  Calls H5Oexists_by_name
+ * INPUTS
+ *  loc_id  - File or group identifier
+ *  name    - Attribute access property list
+ *  namelen - Size of name
+ *  lapl_id - Link access property list
+ *
+ * RETURNS
+ *  link status: 0 = false, 1 = true, -1 on failure
+ * AUTHOR
+ *  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)
+/******/
+{
+  char *c_name = NULL;          /* Buffer to hold C string */
+  int_f ret_value = 0;          /* Return value */
+  htri_t status = 0;
+
+  /*
+   * 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
+ * NAME
+ *  h5oincr_refcount_c
+ * PURPOSE
+ *  Calls H5Oincr_refcount
+ * INPUTS
+ *  object_id - Object identifier.
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  May 16, 2012
+ * SOURCE
+*/
+int_f
+nh5oincr_refcount_c (hid_t_f *object_id)
+/******/
+{
+  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);
+
+ done:
+  return ret_value;
+}
+
+/****if* H5Of/h5oset_comment_c
+ * NAME
+ *  h5oset_comment_c
+ * PURPOSE
+ *  Calls H5Oset_comment
+ * INPUTS
+ *  object_id  - Identifier of the target object.
+ *  comment    - The new comment.
+ *  commentlen - Length of the comment.
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  May 17, 2012
+ * SOURCE
+*/
+int_f
+nh5oset_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;
+}
+
+/****if* H5Of/h5oset_comment_by_name_c
+ * NAME
+ *  h5oset_comment_by_name_c
+ * PURPOSE
+ *  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. 
+ *  namelen    - Length of the name.
+ *  comment    - The new comment.
+ *  commentlen - Length of the comment.
+ *  lapl_id    - Link access property list identifier.
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  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)
+/******/
+{
+  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
+ *  h5oopen_by_idx_c
+ * PURPOSE
+ *  Calls H5Oopen_by_idx_c
+ * INPUTS
+ *  loc_id        - A file or group identifier.
+ *  group_name    - Name of group, relative to loc_id, in which object is located.
+ *  group_namelen - Length of group_name
+ *  index_type    - Type of index by which objects are ordered.
+ *  order         - Order of iteration within index.
+ *  n             - Object to open.
+ *  lapl_id       - Link access property list.
+ * OUTPUTS
+ *   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)
+/******/
+{
+  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
+ * NAME
+ *  h5oget_comment_c
+ * PURPOSE
+ *  Calls  H5Oget_comment
+ * INPUTS
+ *  object_id  - Identifier for the target object.
+ *  bufsize    - Anticipated required size of the comment buffer.
+ * OUTPUTS
+ *  comment    - The comment.
+ *
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  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)
+/******/
+{
+  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
+ * NAME
+ *  h5oget_comment_by_name_c
+ * PURPOSE
+ *  Calls H5Oget_comment_by_name
+ * INPUTS
+ *  object_id  - Identifier for the target object.
+ *  bufsize    - Anticipated required size of the comment buffer.
+ * OUTPUTS
+ *  comment    - The comment.
+ *
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  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)
+/******/
+{
+  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 */
+  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((*bufsize = (size_t_f)H5Oget_comment_by_name((hid_t)*loc_id, c_name, c_comment, (size_t)*commentsize,(hid_t)*lapl_id )) < 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);
+  if(c_name)
+    HDfree(c_name);
+
+  return ret_value;
+}
diff --git a/fortran/src/H5Off.f90 b/fortran/src/H5Off.f90
index 4f1ea18..2d8509f 100644
--- a/fortran/src/H5Off.f90
+++ b/fortran/src/H5Off.f90
@@ -119,15 +119,15 @@ CONTAINS
 !  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.
+!  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.
+!  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.
+!  lapl_id - Access property list identifier for the link pointing to the object.
 !
 ! AUTHOR
 !  M. Scot Breitenfeld
@@ -215,12 +215,12 @@ CONTAINS
 !  Opens an object using its address within an HDF5 file. 
 !
 ! Inputs:  
-!    loc_id - File or group identifier.
-!    addr   - Object’s address in the file.
+!  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.
+!  obj_id - Object identifier for the opened object.
+!  hdferr - Returns 0 if successful and -1 if fails.
 !
 ! AUTHOR	
 !  M. Scot Breitenfeld
@@ -321,5 +321,455 @@ CONTAINS
 
   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(IN)  :: 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
index 8eb7a4b..dbd674a 100644
--- a/fortran/src/H5Off_F03.f90
+++ b/fortran/src/H5Off_F03.f90
@@ -181,14 +181,14 @@ CONTAINS
 ! Inputs:
 !  loc_id      - File or group identifier specifying location of group 
 !                in which object is located.
-!  name        - Name of group, relative to loc_id
+!  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
+!  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
+!  lapl_id     - Link access property list.
 !
 ! AUTHOR
 !  M. Scot Breitenfeld
@@ -218,11 +218,12 @@ CONTAINS
          !DEC$IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_INFO_BY_NAME_C'::h5oget_info_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_default
-         TYPE(C_PTR),value             :: object_info
+         TYPE(C_PTR),VALUE             :: object_info
 
        END FUNCTION h5oget_info_by_name_c
     END INTERFACE
@@ -238,5 +239,222 @@ CONTAINS
 
   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)
+         USE H5GLOBAL
+         USE, INTRINSIC :: ISO_C_BINDING
+         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_INFO_C'::h5oget_info_c
+         !DEC$ENDIF
+         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         :: corder_valid
+    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)
+         USE H5GLOBAL
+         USE, INTRINSIC :: ISO_C_BINDING
+         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_INFO_BY_IDX_C'::h5oget_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) , 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
+    TYPE(C_PTR)     :: ptr
+
+    INTERFACE
+       INTEGER FUNCTION h5ovisit_by_name_c(loc_id, object_name, namelen, index_type, order, &
+            op, op_data, lapl_id)
+         USE, INTRINSIC :: ISO_C_BINDING
+         USE H5GLOBAL
+         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OVISIT_BY_NAME_C'::h5ovisit_by_name_c
+         !DEC$ENDIF
+         !DEC$ATTRIBUTES reference :: object_name
+         INTEGER(HID_T)  , INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), 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/H5Pff.f90 b/fortran/src/H5Pff.f90
index d50e3b9..4254b7f 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -6419,3 +6419,5 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 
 END MODULE H5P
 
+
+
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 7b55384..4c85df2 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -398,7 +398,11 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5e_flags, hid_t_f *h5e_hid_flags, int
     h5d_flags[19] = (int_f)H5D_CHUNK_CACHE_NSLOTS_DEFAULT;
     h5d_flags[20] = (int_f)H5D_CHUNK_CACHE_NBYTES_DEFAULT;
     h5d_flags[21] = (int_f)H5D_CHUNK_CACHE_W0_DEFAULT;
-
+    h5d_flags[22] = (int_f)H5D_MPIO_NO_COLLECTIVE;
+    h5d_flags[23] = (int_f)H5D_MPIO_CHUNK_INDEPENDENT;
+    h5d_flags[24] = (int_f)H5D_MPIO_CHUNK_COLLECTIVE;
+    h5d_flags[25] = (int_f)H5D_MPIO_CHUNK_MIXED;
+    h5d_flags[26] = (int_f)H5D_MPIO_CONTIGUOUS_COLLECTIVE;
 /*
  *  H5E flags
  */
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 3d4f7f8..2ee0edf 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -354,7 +354,7 @@ MODULE H5GLOBAL
   ! H5D flags declaration
   !
 
-  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 22
+  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 27
   INTEGER H5D_flags(H5D_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
   !DEC$ATTRIBUTES DLLEXPORT :: /H5D_FLAGS/
@@ -387,10 +387,17 @@ MODULE H5GLOBAL
 
 ! 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 :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F
   INTEGER :: 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)
@@ -419,6 +426,11 @@ MODULE H5GLOBAL
   EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_NSLOTS_DFLT_F)
   EQUIVALENCE(H5D_flags(21), H5D_CHUNK_CACHE_NBYTES_DFLT_F)
   EQUIVALENCE(H5D_flags(22), H5D_CHUNK_CACHE_W0_DFLT_F)
+  EQUIVALENCE(H5D_flags(23), H5D_MPIO_NO_COLLECTIVE_IO_F)
+  EQUIVALENCE(H5D_flags(24), H5D_MPIO_CHUNK_INDEPENDENT_F)
+  EQUIVALENCE(H5D_flags(25), H5D_MPIO_CHUNK_COLLECTIVE_F)
+  EQUIVALENCE(H5D_flags(26), H5D_MPIO_CHUNK_MIXED_F)
+  EQUIVALENCE(H5D_flags(27), H5D_MPIO_CONTIG_COLLECTIVE_F)
 
   !
   ! H5E flags declaration
diff --git a/fortran/src/hdf5_fortrandll.def b/fortran/src/hdf5_fortrandll.def
index 735189a..9a687f2 100644
--- a/fortran/src/hdf5_fortrandll.def
+++ b/fortran/src/hdf5_fortrandll.def
@@ -284,10 +284,25 @@ H5L_mp_H5LIS_REGISTERED_F
 H5L_mp_H5LMOVE_F

 H5L_mp_H5LGET_NAME_BY_IDX_F

 ; H5O

+H5O_mp_H5OCLOSE_F

 H5O_mp_H5OCOPY_F

+H5O_mp_H5ODECR_REFCOUNT_F

+H5O_mp_H5OEXISTS_BY_NAME_F

+H5O_mp_H5OGET_COMMENT_F

+H5O_mp_H5OGET_COMMENT_BY_NAME_F

+H5O_mp_H5OGET_INFO_BY_IDX_F

+H5O_mp_H5OGET_INFO_BY_NAME_F

+H5O_mp_H5OGET_INFO_F

+H5O_mp_H5OINCR_REFCOUNT_F

 H5O_mp_H5OLINK_F

-H5O_mp_H5OOPEN_F

 H5O_mp_H5OOPEN_BY_ADDR_F

+H5O_mp_H5OOPEN_BY_IDX_F

+H5O_mp_H5OOPEN_F

+H5O_mp_H5OSET_COMMENT_F

+H5O_mp_H5OSET_COMMENT_BY_NAME_F

+H5O_mp_H5OVISIT_BY_NAME_F

+H5O_mp_H5OVISIT_F

+

 ; H5P

 H5P_mp_H5PCREATE_F

 H5P_mp_H5PSET_PRESERVE_F