diff options
Diffstat (limited to 'fortran/test')
-rw-r--r-- | fortran/test/tH5G_1_8.F90 | 2 | ||||
-rw-r--r-- | fortran/test/tH5I.F90 | 2 | ||||
-rw-r--r-- | fortran/test/tH5P_F03.F90 | 12 | ||||
-rw-r--r-- | fortran/test/tH5T_F03.F90 | 30 | ||||
-rw-r--r-- | fortran/test/tf.F90 | 8 |
5 files changed, 27 insertions, 27 deletions
diff --git a/fortran/test/tH5G_1_8.F90 b/fortran/test/tH5G_1_8.F90 index c820d78..9444619 100644 --- a/fortran/test/tH5G_1_8.F90 +++ b/fortran/test/tH5G_1_8.F90 @@ -1220,7 +1220,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error) !!$ printf(" %d: Unexpected object type should have been a dataset\n", __LINE__); !!$ TEST_ERROR !!$ } end if -!!$ if(H5F_addr_ne(oinfo1.addr, oinfo2.addr)) { +!!$ if(H5_addr_ne(oinfo1.addr, oinfo2.addr)) { !!$ H5_FAILED(); !!$ puts(" Hard link test failed. Link seems not to point to the "); !!$ puts(" expected file location."); diff --git a/fortran/test/tH5I.F90 b/fortran/test/tH5I.F90 index 7f9b3ab..a5fedb9 100644 --- a/fortran/test/tH5I.F90 +++ b/fortran/test/tH5I.F90 @@ -245,7 +245,7 @@ CONTAINS CALL h5sclose_f(dspace_id, error) CALL check("h5sclose_f",error,total_error) ! - ! Close the dataype. + ! Close the datatype. ! CALL h5tclose_f(atype_id, error) CALL check("h5tclose_f",error,total_error) diff --git a/fortran/test/tH5P_F03.F90 b/fortran/test/tH5P_F03.F90 index 0875b81..f15a471 100644 --- a/fortran/test/tH5P_F03.F90 +++ b/fortran/test/tH5P_F03.F90 @@ -532,6 +532,7 @@ SUBROUTINE external_test_offset(cleanup,total_error) INTEGER(hid_t) :: dset=-1 ! dataset INTEGER(hid_t) :: grp=-1 ! group to emit diagnostics INTEGER(size_t) :: i, j ! miscellaneous counters + INTEGER :: k CHARACTER(LEN=180) :: filename ! file names INTEGER, DIMENSION(1:25) :: part INTEGER, DIMENSION(1:100), TARGET :: whole ! raw data buffers @@ -598,8 +599,9 @@ SUBROUTINE external_test_offset(cleanup,total_error) CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=space, file_space_id=space) CALL check("h5dread_f", error, total_error) - DO i = 1, 100 - IF(whole(i) .NE. i-1)THEN + DO k = 1, 100 + CALL verify("h5dread_f", whole(k), k-1, error) + IF(error .NE. 0)THEN WRITE(*,*) "Incorrect value(s) read." total_error = total_error + 1 EXIT @@ -619,8 +621,10 @@ SUBROUTINE external_test_offset(cleanup,total_error) CALL h5sclose_f(hs_space, error) CALL check("h5sclose_f", error, total_error) - DO i = INT(hs_start(1))+1, INT(hs_start(1)+hs_count(1)) - IF(whole(i) .NE. i-1)THEN + + DO k = INT(hs_start(1))+1, INT(hs_start(1)+hs_count(1)) + CALL verify("h5dread_f", whole(k), k-1, error) + IF(error .NE. 0)THEN WRITE(*,*) "Incorrect value(s) read." total_error = total_error + 1 EXIT diff --git a/fortran/test/tH5T_F03.F90 b/fortran/test/tH5T_F03.F90 index 86e49b6..0f56806 100644 --- a/fortran/test/tH5T_F03.F90 +++ b/fortran/test/tH5T_F03.F90 @@ -3598,32 +3598,26 @@ SUBROUTINE multiple_dset_rw(total_error) CALL check("h5dread_multi_f", error, total_error) ! check the written and read in values + error = 0 DO i = 1, rdim - IF(rbuf_real(i).NE.wbuf_real(i))THEN - total_error = total_error + 1 - END IF + CALL VERIFY("h5dread_multi_f",rbuf_real(i), wbuf_real(i), error) END DO + total_error = total_error + error DO i = 1, idim - IF(rbuf_int(i).NE.wbuf_int(i))THEN - total_error = total_error + 1 - END IF + CALL VERIFY("h5dread_multi_f",rbuf_int(i),wbuf_int(i), error) END DO + total_error = total_error + error DO i = 1, cdim - IF(rbuf_chr(i).NE.wbuf_chr(i))THEN - total_error = total_error + 1 - END IF + CALL VERIFY("h5dread_multi_f",rbuf_chr(i),wbuf_chr(i), error) END DO + total_error = total_error + error + error = 0 DO i = 1, ddim - IF(rbuf_derived(i)%r.NE.wbuf_derived(i)%r)THEN - total_error = total_error + 1 - END IF - IF(rbuf_derived(i)%i.NE.wbuf_derived(i)%i)THEN - total_error = total_error + 1 - END IF - IF(rbuf_derived(i)%c.NE.wbuf_derived(i)%c)THEN - total_error = total_error + 1 - END IF + CALL VERIFY("h5dread_multi_f",rbuf_derived(i)%r,wbuf_derived(i)%r,error) + CALL VERIFY("h5dread_multi_f",rbuf_derived(i)%i,wbuf_derived(i)%i,error) + CALL VERIFY("h5dread_multi_f",rbuf_derived(i)%c,wbuf_derived(i)%c,error) END DO + total_error = total_error + error DO i = 1, idim DO j = 1, idim2 DO k = 1, idim3 diff --git a/fortran/test/tf.F90 b/fortran/test/tf.F90 index 73f43bc..501d243 100644 --- a/fortran/test/tf.F90 +++ b/fortran/test/tf.F90 @@ -69,9 +69,11 @@ CONTAINS CHARACTER(LEN=*), INTENT(IN) :: title_header ! test name INTEGER, PARAMETER :: width = TAB_SPACE+10 - CHARACTER(LEN=2*width) ::title_centered =" " + CHARACTER(LEN=2*width) ::title_centered INTEGER :: len, i + title_centered(:) = " " + len=LEN_TRIM(title_header) title_centered(1:3) ="| |" title_centered((width-len)/2:(width-len)/2+len) = TRIM(title_header) @@ -94,8 +96,8 @@ CONTAINS ENDDO WRITE(*,'("| |")') - WRITE(*,'(A)') title_centered - + WRITE(*,'(A)') TRIM(title_centered) + WRITE(*,'("| |")', ADVANCE="NO") DO i = 1, width-5 WRITE(*,'(1X)', ADVANCE="NO") |