Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed XL and gfortran errors #3968

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Fixed XL and gfortran errors #3968

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31de130
fixed XL and Gfortran errors
brtnfld Jan 29, 2024
0e3ebe3
fixed data type len array
brtnfld Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion fortran/src/H5Fff.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,9 @@ SUBROUTINE h5fget_intent_f(file_id, intent, hdferr)
INTEGER(HID_T), INTENT(IN) :: file_id
INTEGER, INTENT(OUT) :: intent
INTEGER, INTENT(OUT) :: hdferr

INTEGER(C_INT) :: c_intent

INTERFACE
INTEGER(C_INT) FUNCTION H5Fget_intent(file_id, intent) BIND(C,NAME='H5Fget_intent')
IMPORT :: C_INT
Expand All @@ -1230,7 +1233,8 @@ INTEGER(C_INT) FUNCTION H5Fget_intent(file_id, intent) BIND(C,NAME='H5Fget_inten
END FUNCTION H5Fget_intent
END INTERFACE

hdferr = INT(H5Fget_intent(file_id, intent))
hdferr = INT(H5Fget_intent(file_id, c_intent))
intent = INT(c_intent)

END SUBROUTINE h5fget_intent_f

Expand Down
4 changes: 2 additions & 2 deletions fortran/src/H5Sff.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,8 +1533,8 @@ SUBROUTINE h5ssel_iter_get_seq_list_f(sel_iter_id, maxseq, maxbytes, nseq, nbyte
INTEGER(HID_T) , INTENT(IN) :: sel_iter_id
INTEGER(SIZE_T), INTENT(IN) :: maxseq
INTEGER(SIZE_T), INTENT(IN) :: maxbytes
INTEGER(SIZE_T), INTENT(OUT), TARGET :: nseq
INTEGER(SIZE_T), INTENT(OUT), TARGET :: nbytes
INTEGER(SIZE_T), INTENT(OUT) :: nseq
INTEGER(SIZE_T), INTENT(OUT) :: nbytes
INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: off
INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: len
INTEGER, INTENT(OUT) :: hdferr
Expand Down
8 changes: 4 additions & 4 deletions fortran/test/tH5Sselect.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ SUBROUTINE test_select_iter(cleanup, total_error)
INTEGER(SIZE_T) :: nseq ! # of sequences retrieved
INTEGER(SIZE_T) :: nbytes ! # of bytes retrieved
INTEGER(HSIZE_T), DIMENSION(SEL_ITER_MAX_SEQ) :: off ! Offsets for retrieved sequences
INTEGER(SIZE_T), DIMENSION(SEL_ITER_MAX_SEQ) :: ilen ! Lengths for retrieved sequences
INTEGER(HSIZE_T), DIMENSION(SEL_ITER_MAX_SEQ) :: ilen ! Lengths for retrieved sequences
INTEGER :: sel_type ! Selection type
INTEGER :: error ! Error return value
integer(size_t) :: i
Expand Down Expand Up @@ -400,15 +400,15 @@ SUBROUTINE test_select_iter(cleanup, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nseq, INT(0,SIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nbytes, INT(0,SIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", off(1), INT(-99,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(1), INT(-99,SIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(1), INT(-99,HSIZE_T), total_error)
ELSE IF (sel_type .EQ. H5S_SEL_POINTS_F)THEN ! Point selection
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nseq, 4_SIZE_T, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nbytes, 4_SIZE_T, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", off(NUMP+1), INT(-99,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(NUMP+1), INT(-99,HSIZE_T), total_error)
DO i = 1, NUMP
CALL VERIFY("H5Ssel_iter_get_seq_list_f", off(i), INT((i-1)*26+12,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(i), INT(1,SIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(i), INT(1,HSIZE_T), total_error)
ENDDO
ELSE IF (sel_type .eq. H5S_SEL_HYPERSLABS_F)THEN ! Hyperslab selection
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nseq, 4_SIZE_T, total_error)
Expand All @@ -417,7 +417,7 @@ SUBROUTINE test_select_iter(cleanup, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(NUMP+1), INT(-99,HSIZE_T), total_error)
DO i = 1, NUMP
CALL VERIFY("H5Ssel_iter_get_seq_list_f", off(i), INT((i-1)*12,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(i), INT(4,SIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(i), INT(4,HSIZE_T), total_error)
ENDDO
ELSE IF (sel_type.EQ.H5S_SEL_ALL_F)THEN ! "All" selection
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nseq, 1_SIZE_T, total_error )
Expand Down
Loading