[svn-r22205] Brought changes from the trunk in the the branch, used:

svn merge -r r21721:22163 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu)

8 files changed, 159 insertions, 18 deletions

diff --git a/fortran/src/H5Dff.f90 b/fortran/src/H5Dff.f90
index 24917e7..b1e1df1 100644
--- a/fortran/src/H5Dff.f90
+++ b/fortran/src/H5Dff.f90
@@ -519,7 +519,7 @@ CONTAINS
   SUBROUTINE h5dget_space_status_f(dset_id, flag, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id  ! Dataspace identifier
-    INTEGER, INTENT(IN)        :: flag     ! Memory buffer to fill in
+    INTEGER, INTENT(OUT)       :: flag     ! Memory buffer to fill in
     INTEGER, INTENT(OUT)       :: hdferr   ! Error code
   !*****
     INTERFACE
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index ffbf661..4c77d3d 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -334,3 +334,60 @@ nh5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *
   return ret_value;
 }
 
+/* ***if* H5Of/H5Ocopy_c
+ * NAME
+ *  H5Ocopy_c
+ * PURPOSE
+ *  Calls H5Ocopy
+ * INPUTS  
+ *  src_loc_id   - Object identifier indicating the location of the source object to be copied 
+ *  src_name     - Name of the source object to be copied 
+ *  src_name_len - Length of src_name
+ *  dst_loc_id   - Location identifier specifying the destination 
+ *  dst_name     - Name to be assigned to the new copy 
+ *  dst_name_len - Length of dst_name
+ *  ocpypl_id    - Object copy property list
+ *  lcpl_id      - Link creation property list for the new hard link
+ *
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  March 14, 2012
+ * SOURCE
+*/
+int_f
+nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
+	    hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
+	    hid_t_f *ocpypl_id, hid_t_f *lcpl_id )
+/******/
+{
+  char *c_src_name = NULL;  /* Buffer to hold C string */
+  char *c_dst_name = NULL;  /* Buffer to hold C string */
+  
+  int_f ret_value = 0;      /* Return value */
+  
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_src_name = HD5f2cstring(src_name, (size_t)*src_name_len)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_dst_name = HD5f2cstring(dst_name, (size_t)*dst_name_len)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Ocopy function.
+   */
+  if(H5Ocopy( (hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name, 
+	      (hid_t)*ocpypl_id, (hid_t)*lcpl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+ done:
+  if(c_src_name)
+    HDfree(c_src_name);
+  if(c_dst_name)
+    HDfree(c_dst_name);
+
+  return ret_value;
+
+}
diff --git a/fortran/src/H5Off.f90 b/fortran/src/H5Off.f90
index e69fdb5..04c96e2 100644
--- a/fortran/src/H5Off.f90
+++ b/fortran/src/H5Off.f90
@@ -250,5 +250,77 @@ CONTAINS
 
   END SUBROUTINE h5oopen_by_addr_f
 
+!
+!****s* H5O/h5ocopy_f
+! NAME		
+!  h5ocopy_f 
+!
+! PURPOSE
+!  Copies an object in an HDF5 file.
+!
+! INPUTS  
+!  src_loc_id - Object identifier indicating the location of the source object to be copied 
+!  src_name   - Name of the source object to be copied 
+!  dst_loc_id - Location identifier specifying the destination 
+!  dst_name   - Name to be assigned to the new copy
+!
+! OPTIONAL PARAMETERS
+!  ocpypl_id  - Object copy property list
+!  lcpl_id    - Link creation property list for the new hard link
+!
+! OUTPUTS: 
+!  hdferr     - Returns 0 if successful and -1 if fails
+!
+! AUTHOR	
+!  M. Scot Breitenfeld
+!  March 14, 2012
+! 
+! SOURCE
+  SUBROUTINE h5ocopy_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr, ocpypl_id, lcpl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN) :: src_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: src_name
+    INTEGER(HID_T)  , INTENT(IN) :: dst_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: dst_name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: ocpypl_id
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lcpl_id
+!*****
+
+    INTEGER(SIZE_T) :: src_name_len, dst_name_len
+    INTEGER(HID_T)  :: ocpypl_id_default, lcpl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5ocopy_c(src_loc_id, src_name, src_name_len, &
+            dst_loc_id, dst_name, dst_name_len, ocpypl_id_default, lcpl_id_default)
+         USE H5GLOBAL
+         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OCOPY_C'::h5ocopy_c
+         !DEC$ENDIF
+         !DEC$ATTRIBUTES reference :: src_name, dst_name
+         INTEGER(HID_T)  , INTENT(IN) :: src_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: src_name
+         INTEGER(HID_T)  , INTENT(IN) :: dst_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: dst_name
+         INTEGER(HID_T)  , INTENT(IN) :: ocpypl_id_default
+         INTEGER(HID_T)  , INTENT(IN) :: lcpl_id_default
+         INTEGER(SIZE_T)              :: src_name_len, dst_name_len
+
+       END FUNCTION h5ocopy_c
+    END INTERFACE
+
+    src_name_len = LEN(src_name)
+    dst_name_len = LEN(dst_name)
+
+    ocpypl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(ocpypl_id)) ocpypl_id_default = ocpypl_id
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+
+    hdferr = h5ocopy_c(src_loc_id, src_name, src_name_len, &
+         dst_loc_id, dst_name, dst_name_len, ocpypl_id_default, lcpl_id_default)
+
+  END SUBROUTINE h5ocopy_f
+
 END MODULE H5O
 
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index a22b2e3..9f7022c 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -53,11 +53,23 @@ CONTAINS
 ! INPUTS
 !  class  - type of the property class to be created.
 !	    Possible values are:
-!	      H5P_FILE_CREATE_F
-!	      H5P_FILE_ACCESS_F
-!	      H5P_DATASET_CREATE_F
-!	      H5P_DATASET_XFER_F
-!	      H5P_FILE_MOUNT_F
+!             H5P_OBJECT_CREATE_F
+!             H5P_FILE_CREATE_F
+!             H5P_FILE_ACCESS_F
+!             H5P_DATASET_CREATE_F
+!             H5P_DATASET_ACCESS_F
+!             H5P_DATASET_XFER_F
+!             H5P_FILE_MOUNT_F
+!             H5P_GROUP_CREATE_F
+!             H5P_GROUP_ACCESS_F
+!             H5P_DATATYPE_CREATE_F
+!             H5P_DATATYPE_ACCESS_F
+!             H5P_STRING_CREATE_F
+!             H5P_ATTRIBUTE_CREATE _F
+!             H5P_OBJECT_COPY_F
+!             H5P_LINK_CREATE_F
+!             H5P_LINK_ACCESS_F
+!
 ! OUTPUTS
 !  prp_id - property list identifier
 !  hdferr - error code		
@@ -76,16 +88,9 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5pcreate_f(class, prp_id, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class   ! The type of the property list 
-                                          ! to be created. Possible values are: 
-                                          !  H5P_FILE_CREATE_F
-                                          !  H5P_FILE_ACCESS_F
-                                          !  H5P_DATASET_CREATE_F
-                                          !  H5P_DATASET_XFER_F
-                                          !  H5P_FILE_MOUNT_F
-    INTEGER(HID_T), INTENT(OUT) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
+    INTEGER(HID_T), INTENT(IN)  :: class
+    INTEGER(HID_T), INTENT(OUT) :: prp_id
+    INTEGER       , INTENT(OUT) :: hdferr
 !*****
 !            INTEGER, EXTERNAL :: h5pcreate_c
 !  MS FORTRAN needs explicit interface for C functions called here.
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 89957a4..a504653 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -805,10 +805,12 @@ H5_FCDLL int_f nh5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts,
 
 #define nh5olink_c       H5_FC_FUNC_(h5olink_c, H5OLINK_C)
 #define nh5oopen_c       H5_FC_FUNC_(h5oopen_c, H5OOPEN_C)
-#define nh5oclose_c       H5_FC_FUNC_(h5oclose_c, H5OCLOSE_C)
+#define nh5oclose_c      H5_FC_FUNC_(h5oclose_c, H5OCLOSE_C)
 #define nh5ovisit_c      H5_FC_FUNC_(h5ovisit_c,H5OVISIT_C)
 #define nh5oget_info_by_name_c H5_FC_FUNC_(h5oget_info_by_name_c ,H5OGET_INFO_BY_NAME_C)
 #define nh5oopen_by_addr_c H5_FC_FUNC_(h5oopen_by_addr_c, H5OOPEN_BY_ADDR_C)
+#define nh5ocopy_c         H5_FC_FUNC_(h5ocopy_c, H5OCOPY_C)
+
 
 H5_FCDLL int_f nh5oopen_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id);
 H5_FCDLL int_f nh5oclose_c (hid_t_f *object_id );
@@ -818,6 +820,9 @@ H5_FCDLL int_f nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, s
 H5_FCDLL int_f nh5ovisit_c (hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data);
 H5_FCDLL int_f nh5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen,hid_t_f *lapl_id,
 				       H5O_info_t_f *object_info);
+H5_FCDLL int_f nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
+			   hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
+			   hid_t_f *ocpypl_id, hid_t_f *lcpl_id );
 /*
  * Functions from H5Pf.c
  */
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 9e9409d..2d7b5b4 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -189,7 +189,7 @@ for arg in $@ ; do
         get_output_file="yes"
       fi
       ;;
-    -E|-M)
+    -E|-M|-MT)
       allargs="$allargs $arg"
       compile_args="$compile_args $arg"
       dash_c="yes"
diff --git a/fortran/src/hdf5_fortrandll.def b/fortran/src/hdf5_fortrandll.def
index 6b3aad8..29e83f5 100644
--- a/fortran/src/hdf5_fortrandll.def
+++ b/fortran/src/hdf5_fortrandll.def
@@ -284,6 +284,7 @@ H5L_mp_H5LIS_REGISTERED_F
 H5L_mp_H5LMOVE_F

 H5L_mp_H5LGET_NAME_BY_IDX_F

 ; H5O

+H5O_mp_H5OCOPY_F

 H5O_mp_H5OLINK_F

 H5O_mp_H5OOPEN_F

 H5O_mp_H5OOPEN_BY_ADDR_F

diff --git a/fortran/src/phdf5_fortrandll.def b/fortran/src/phdf5_fortrandll.def
index a4bc9eb..7a196cd 100644
--- a/fortran/src/phdf5_fortrandll.def
+++ b/fortran/src/phdf5_fortrandll.def
@@ -284,6 +284,7 @@ H5L_mp_H5LIS_REGISTERED_F
 H5L_mp_H5LMOVE_F

 H5L_mp_H5LGET_NAME_BY_IDX_F

 ; H5O

+H5O_mp_H5OCOPY_F

 H5O_mp_H5OLINK_F

 H5O_mp_H5OOPEN_F

 H5O_mp_H5OOPEN_BY_ADDR_F