[svn-r18099] Description:

Merged changes from trunk/fortran into the branch used:

svn merge -r 17682:18098 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested on: jam (intel)
           amani (pgi)

4 files changed, 68 insertions, 55 deletions

diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90
index 2f359e9..e38dade 100644
--- a/fortran/src/H5Lff.f90
+++ b/fortran/src/H5Lff.f90
@@ -576,10 +576,10 @@ CONTAINS
 !      corder - specifies the link’s creation order position.
 !f_corder_valid - indicates whether the value in corder is valid.
 !         link_type -  specifies the link class:
-!     	                H5L_LINK_HARD_F      - Hard link
-!     	                H5L_LINK_SOFT_F      - Soft link
-!     	                H5L_LINK_EXTERNAL_F  - External link
-!     	                H5L_LINK_ERROR_ F    - Error
+!     	                H5L_TYPE_HARD_F      - Hard link
+!     	                H5L_TYPE_SOFT_F      - Soft link
+!     	                H5L_TYPE_EXTERNAL_F  - External link
+!     	                H5L_TYPE_ERROR_F    - Error
 !           address - If the link is a hard link, address specifies the file address that the link points to
 !          val_size - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
 !                     the length of the name of the pointed-to object with a null terminator. 
@@ -592,7 +592,12 @@ CONTAINS
 ! Programmer:	M. S. Breitenfeld
 !		February 29, 2008	
 !
-! Modifications:  N/A
+! Modifications:  
+!   Changed the link_type names to match those in C (bug 1720) from,
+!   H5L_LINK_HARD_F, H5L_LINK_SOFT_F,H5L_LINK_EXTERNAL_F,H5L_LINK_ERROR_F 
+!   to
+!   H5L_TYPE_HARD_F, H5L_TYPE_SOFT_F,H5L_TYPE_EXTERNAL_F,H5L_TYPE_ERROR_F
+!   MSB January 8, 2010.
 !
 !----------------------------------------------------------------------
 
@@ -609,10 +614,10 @@ CONTAINS
     INTEGER, INTENT(OUT) :: corder ! Specifies the link’s creation order position.
     LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the value in corder is valid.
     INTEGER, INTENT(OUT) :: link_type ! Specifies the link class:
-     	                              !  H5L_LINK_HARD_F      - Hard link
-     	                              !  H5L_LINK_SOFT_F      - Soft link
-     	                              !  H5L_LINK_EXTERNAL_F  - External link
-     	                              !  H5L_LINK_ERROR _F    - Error
+     	                              !  H5L_TYPE_HARD_F      - Hard link
+     	                              !  H5L_TYPE_SOFT_F      - Soft link
+     	                              !  H5L_TYPE_EXTERNAL_F  - External link
+     	                              !  H5L_TYPE_ERROR _F    - Error
     INTEGER(HADDR_T), INTENT(OUT) :: address  ! If the link is a hard link, address specifies the file address that the link points to
     INTEGER(SIZE_T), INTENT(OUT) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value, e.g., 
                                              ! the length of the name of the pointed-to object with a null terminator. 
@@ -691,7 +696,12 @@ CONTAINS
 ! Programmer: M.S. Breitenfeld
 !	      February 29, 2008	
 !
-! Modifications:  N/A
+! Modifications:    
+!   Changed the link_type names to match those in C (bug 1720) from,
+!   H5L_LINK_HARD_F, H5L_LINK_SOFT_F,H5L_LINK_EXTERNAL_F,H5L_LINK_ERROR_F 
+!   to
+!   H5L_TYPE_HARD_F, H5L_TYPE_SOFT_F,H5L_TYPE_EXTERNAL_F,H5L_TYPE_ERROR_F
+!   MSB January 8, 2010.
 !
 !----------------------------------------------------------------------
   SUBROUTINE h5lget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
@@ -711,10 +721,10 @@ CONTAINS
                                         !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
     INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
     INTEGER, INTENT(OUT) :: link_type ! Specifies the link class:
-     	                              !  H5L_LINK_HARD_F      - Hard link
-     	                              !  H5L_LINK_SOFT_F      - Soft link
-     	                              !  H5L_LINK_EXTERNAL_F  - External link
-     	                              !  H5L_LINK_ERROR _F    - Error
+     	                              !  H5L_TYPE_HARD_F      - Hard link
+     	                              !  H5L_TYPE_SOFT_F      - Soft link
+     	                              !  H5L_TYPE_EXTERNAL_F  - External link
+     	                              !  H5L_TYPE_ERROR _F    - Error
     LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
     INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
     INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index c35c383..48d36ab 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -7056,10 +7056,10 @@
 !	     other chunks.
 !
 ! Inputs:  
-!		dapl_id            - Link creation property list identifier
-!               rdcc_nslots        - 
-!               rdcc_nbytes        -
-!               rdcc_w0            -
+!		dapl_id            - Dataset access property list identifier.
+!               rdcc_nslots        - The number of chunk slots in the raw data chunk cache for this dataset.
+!               rdcc_nbytes        - The total size of the raw data chunk cache for this dataset.
+!               rdcc_w0            - The chunk preemption policy for this dataset.
 ! Outputs:
 !		hdferr:		   - error code		
 !				 	Success:  0
@@ -7075,11 +7075,14 @@
 
   SUBROUTINE h5pset_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dapl_id
-    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nslots
-    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
-    REAL, INTENT(IN) :: rdcc_w0 
-    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), INTENT(IN) :: dapl_id      ! Dataset access property list identifier.
+    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nslots ! The number of chunk slots in the raw data 
+                                               ! chunk cache for this dataset.
+    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes ! The total size of the raw data chunk cache 
+                                               ! for this dataset.
+    REAL, INTENT(IN) :: rdcc_w0                ! The chunk preemption policy for this dataset.
+    INTEGER, INTENT(OUT) :: hdferr             ! Error code
+                                               ! 0 on success and -1 on failure
     
 
     INTERFACE
@@ -7111,11 +7114,11 @@
 !          file access property list are returned.
 !
 ! Inputs:  
-!		dapl_id            - Link creation property list identifier
-!               rdcc_nslots        - 
-!               rdcc_nbytes        -
-!               rdcc_w0            -
-! Outputs:
+!		dapl_id            - Dataset access property list identifier.
+! Outputs: 
+!               rdcc_nslots        - Number of chunk slots in the raw data chunk cache hash table. 
+!               rdcc_nbytes        - Total size of the raw data chunk cache, in bytes. 
+!               rdcc_w0            - Preemption policy. 
 !		hdferr:		   - error code		
 !				 	Success:  0
 !				 	Failure: -1   
@@ -7130,11 +7133,11 @@
 
   SUBROUTINE h5pget_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dapl_id
-    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nslots
-    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
-    REAL, INTENT(OUT) :: rdcc_w0 
-    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), INTENT(IN) :: dapl_id ! Dataset access property list identifier.
+    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nslots ! Number of chunk slots in the raw data chunk cache hash table.
+    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes ! Total size of the raw data chunk cache, in bytes. 
+    REAL, INTENT(OUT) :: rdcc_w0 ! Preemption policy.
+    INTEGER, INTENT(OUT) :: hdferr ! error code
     
     INTERFACE
        INTEGER FUNCTION h5pget_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 28d00f7..da21f6e 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -473,10 +473,10 @@ MODULE H5GLOBAL
   INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6
   INTEGER :: H5L_flags(H5L_FLAGS_LEN)
 
-  INTEGER :: H5L_LINK_ERROR_F
-  INTEGER :: H5L_LINK_HARD_F
-  INTEGER :: H5L_LINK_SOFT_F
-  INTEGER :: H5L_LINK_EXTERNAL_F
+  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
 
@@ -485,10 +485,10 @@ MODULE H5GLOBAL
   !DEC$endif
   COMMON /H5L_FLAGS/ H5L_flags
 
-  EQUIVALENCE(H5L_flags(1), H5L_LINK_ERROR_F)
-  EQUIVALENCE(H5L_flags(2), H5L_LINK_HARD_F)
-  EQUIVALENCE(H5L_flags(3), H5L_LINK_SOFT_F)
-  EQUIVALENCE(H5L_flags(4), H5L_LINK_EXTERNAL_F)
+  EQUIVALENCE(H5L_flags(1), H5L_TYPE_ERROR_F)
+  EQUIVALENCE(H5L_flags(2), H5L_TYPE_HARD_F)
+  EQUIVALENCE(H5L_flags(3), H5L_TYPE_SOFT_F)
+  EQUIVALENCE(H5L_flags(4), H5L_TYPE_EXTERNAL_F)
   EQUIVALENCE(H5L_flags(5), H5L_SAME_LOC_F)
   EQUIVALENCE(H5L_flags(6), H5L_LINK_CLASS_T_VERS_F)
   !
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90
index 9c28f75..725e21b 100644
--- a/fortran/test/tH5G_1_8.f90
+++ b/fortran/test/tH5G_1_8.f90
@@ -646,10 +646,10 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      INTEGER :: corder ! Specifies the link’s creation order position.
      LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
      INTEGER :: link_type ! Specifies the link class:
-     	                              !  H5L_LINK_HARD_F      - Hard link
-     	                              !  H5L_LINK_SOFT_F      - Soft link
-     	                              !  H5L_LINK_EXTERNAL_F  - External link
-     	                              !  H5L_LINK_ERROR _F    - Error
+     	                              !  H5L_TYPE_HARD_F      - Hard link
+     	                              !  H5L_TYPE_SOFT_F      - Soft link
+     	                              !  H5L_TYPE_EXTERNAL_F  - External link
+     	                              !  H5L_TYPE_ERROR _F    - Error
      INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
      INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
 
@@ -689,7 +689,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 
 !     CALL VerifyLogical("H5Lget_info_by_idx_f11", f_corder_valid, .TRUE., total_error)
 
-     CALL VERIFY("H5Lget_info_by_idx_f", H5L_LINK_SOFT_F, link_type, total_error)
+     CALL VERIFY("H5Lget_info_by_idx_f", H5L_TYPE_SOFT_F, link_type, total_error)
      CALL VERIFY("H5Lget_info_by_idx_f", cset, H5T_CSET_ASCII_F, total_error)
      ! should be '/d1' + NULL character = 4
      CALL VERIFY("H5Lget_info_by_idx_f", INT(val_size), 4, total_error)
@@ -753,10 +753,10 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
     INTEGER :: corder ! Specifies the link’s creation order position.
     LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
     INTEGER :: link_type ! Specifies the link class:
-     	                              !  H5L_LINK_HARD_F      - Hard link
-     	                              !  H5L_LINK_SOFT_F      - Soft link
-     	                              !  H5L_LINK_EXTERNAL_F  - External link
-     	                              !  H5L_LINK_ERROR _F    - Error
+     	                              !  H5L_TYPE_HARD_F      - Hard link
+     	                              !  H5L_TYPE_SOFT_F      - Soft link
+     	                              !  H5L_TYPE_EXTERNAL_F  - External link
+     	                              !  H5L_TYPE_ERROR _F    - Error
     INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
     INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
 
@@ -1318,7 +1318,7 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
 
               CALL VerifyLogical("H5Lget_info_by_idx_f", f_corder_valid, .TRUE., total_error)
 
-              CALL VERIFY("H5Lget_info_by_idx_f", H5L_LINK_HARD_F, link_type, total_error)
+              CALL VERIFY("H5Lget_info_by_idx_f", H5L_TYPE_HARD_F, link_type, total_error)
               IF(iorder.EQ.H5_ITER_INC_F)THEN
                  CALL VERIFY("H5Lget_info_by_idx_f", corder, u+1, total_error)
               ELSE
@@ -1511,10 +1511,10 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   INTEGER :: corder ! Specifies the link’s creation order position.
   LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
   INTEGER :: link_type ! Specifies the link class:
-     	                              !  H5L_LINK_HARD_F      - Hard link
-     	                              !  H5L_LINK_SOFT_F      - Soft link
-     	                              !  H5L_LINK_EXTERNAL_F  - External link
-     	                              !  H5L_LINK_ERROR _F    - Error
+     	                              !  H5L_TYPE_HARD_F      - Hard link
+     	                              !  H5L_TYPE_SOFT_F      - Soft link
+     	                              !  H5L_TYPE_EXTERNAL_F  - External link
+     	                              !  H5L_TYPE_ERROR _F    - Error
   INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
   INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value