Skip to content

Commit

Permalink
Fixed XL and gfortran errors (#3968)
Browse files Browse the repository at this point in the history
* fixed XL and Gfortran errors

* fixed data type len array
  • Loading branch information
brtnfld authored Jan 30, 2024
1 parent 1e511d4 commit 791915e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
6 changes: 5 additions & 1 deletion fortran/src/H5Fff.F90
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
8 changes: 4 additions & 4 deletions fortran/src/H5Sff.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1533,10 +1533,10 @@ 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(SIZE_T), DIMENSION(*), INTENT(OUT) :: len
INTEGER, INTENT(OUT) :: hdferr

INTERFACE
Expand All @@ -1550,7 +1550,7 @@ INTEGER(C_INT) FUNCTION H5Ssel_iter_get_seq_list(sel_iter_id, maxseq, maxbytes,
INTEGER(SIZE_T) :: nseq
INTEGER(SIZE_T) :: nbytes
INTEGER(HSIZE_T), DIMENSION(*) :: off
INTEGER(HSIZE_T), DIMENSION(*) :: len
INTEGER(SIZE_T), DIMENSION(*) :: len
END FUNCTION H5Ssel_iter_get_seq_list
END INTERFACE

Expand Down
8 changes: 4 additions & 4 deletions fortran/test/tH5Sselect.F90
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ SUBROUTINE test_select_iter(cleanup, total_error)
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)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(NUMP+1), INT(-99,SIZE_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)
Expand All @@ -414,7 +414,7 @@ SUBROUTINE test_select_iter(cleanup, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nseq, 4_SIZE_T, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nbytes, 16_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)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(NUMP+1), INT(-99,SIZE_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)
Expand All @@ -423,9 +423,9 @@ SUBROUTINE test_select_iter(cleanup, total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nseq, 1_SIZE_T, total_error )
CALL VERIFY("H5Ssel_iter_get_seq_list_f", nbytes, 72_SIZE_T, total_error )
CALL VERIFY("H5Ssel_iter_get_seq_list_f", off(1), INT(0,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(1), INT(72,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(1), INT(72,SIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", off(2), INT(-99,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(2), INT(-99,HSIZE_T), total_error)
CALL VERIFY("H5Ssel_iter_get_seq_list_f", ilen(2), INT(-99,SIZE_T), total_error)
ELSE
CALL check("Incorrect selection option", error, total_error)
ENDIF
Expand Down

0 comments on commit 791915e

Please sign in to comment.