mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-24 17:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22854] Fixed issues with default 8-byte real and default 8-byte integers and the new H5O routines.

Browse Source 
Tested: jam (gcc,intel)
This commit is contained in:
Scot Breitenfeld 2012-10-02 19:53:21 -05:00
parent 7648354b80
commit 3e59374ccd
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fortran/src/H5Of.c
View File

@ -32,7 +32,6 @@ fill_h5o_info_t_f(H5O_info_t Oinfo, H5O_info_t_f *object_info) {
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;

2
fortran/src/H5Off.f90
View File

@ -647,7 +647,7 @@ CONTAINS
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(OUT) :: obj_id
INTEGER(HID_T) , INTENT(IN) :: lapl_id_default
END FUNCTION h5oopen_by_idx_c

4
fortran/src/H5Off_F03.f90
View File

@ -82,9 +82,9 @@ MODULE H5O_PROVISIONAL
ENDTYPE meta_size_t
TYPE, BIND(C) :: h5o_info_t
INTEGER(c_long) :: fileno ! File number that object is located in
INTEGER(C_LONG) :: fileno ! File number that object is located in
INTEGER(haddr_t) :: addr ! Object address in file
INTEGER :: type ! Basic object type (group, dataset, etc.)
INTEGER(C_INT) :: type ! Basic object type (group, dataset, etc.)
INTEGER :: rc ! Reference count of object
INTEGER, DIMENSION(8) :: atime ! Access time ! -- NOTE --

2
fortran/src/H5f90proto.h
View File

@ -61,7 +61,7 @@ typedef struct H5O_hdr_info_t_f {
typedef struct H5O_info_t_f {
unsigned long fileno; /* File number that object is located in */
haddr_t_f addr; /* Object address in file */
int_f type; /* Basic object type (group, dataset, etc.) */
int type; /* Basic object type (group, dataset, etc.) */
int_f rc; /* Reference count of object */
int_f atime[8]; /* Access time */
int_f mtime[8]; /* Modification time */

6
fortran/test/tH5O_F03.f90
View File

@ -54,11 +54,11 @@ MODULE visit_cb
! Object visit structs
TYPE, bind(c) :: obj_visit_t
CHARACTER(LEN=1), DIMENSION(1:180) :: path ! Path to object
INTEGER(c_int) :: type_obj ! type of object
INTEGER :: type_obj ! type of object
END TYPE obj_visit_t
TYPE, bind(c) :: ovisit_ud_t
INTEGER(c_int) :: idx ! Index in object visit structure
INTEGER :: idx ! Index in object visit structure
TYPE(obj_visit_t), DIMENSION(1:info_size) :: info ! Pointer to the object visit structure to use
END TYPE ovisit_ud_t
@ -74,7 +74,7 @@ CONTAINS
TYPE(ovisit_ud_t) :: op_data
INTEGER :: len, i
INTEGER(C_INT) :: idx
INTEGER :: idx
visit_obj_cb = 0

12
fortran/test/tH5T_F03.f90
View File

@ -2918,8 +2918,9 @@ SUBROUTINE setup_buffer(data_in, line_lengths, char_type)
INTEGER, DIMENSION(1:3) :: letters
CHARACTER(LEN=3) :: lets
CHARACTER(KIND=C_CHAR,LEN=*) :: char_type
CHARACTER(KIND=C_CHAR,LEN=1) :: char_tmp
INTEGER :: i, j, n, ff
! Convert the letters and special character to integers
lets = 'abc'
@ -2929,15 +2930,18 @@ SUBROUTINE setup_buffer(data_in, line_lengths, char_type)
j = 1
DO i=1,n-1
IF( j .EQ. 4 )THEN
WRITE(data_in(i:i),'(A1)') ff
WRITE(char_tmp,'(A1)') ff
data_in(i:i) = char_tmp
ELSE
WRITE(data_in(i:i),'(A1)') letters(j)
WRITE(char_tmp,'(A1)') letters(j)
data_in(i:i) = char_tmp
ENDIF
line_lengths(i) = LEN_TRIM(data_in(i))
j = j + 1
IF( j .EQ. 5 ) j = 1
END DO
WRITE(data_in(n:n),'(A1)') ff
WRITE(char_tmp,'(A1)') ff
data_in(n:n) = char_tmp
line_lengths(n) = 1
END SUBROUTINE setup_buffer