diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-04-08 00:18:20 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-04-08 00:18:20 (GMT) |
| commit | ff9a10cfdacfd30fc1720b7c82bc28d204b76ce2 (patch) | |
| tree | 2e7c07b41caace92775d8162012d94e79b4df029 /fortran/test/tH5A.f90 | |
| parent | 67a61ed22f31b9af0ace476b0cc58d7236bb9ac3 (diff) | |
| download | hdf5-ff9a10cfdacfd30fc1720b7c82bc28d204b76ce2.zip hdf5-ff9a10cfdacfd30fc1720b7c82bc28d204b76ce2.tar.gz hdf5-ff9a10cfdacfd30fc1720b7c82bc28d204b76ce2.tar.bz2 | |
[svn-r24984] Added overload operatorZ to compare REALs for tests.
Tested on jam (gfortran, (-r8))
Diffstat (limited to 'fortran/test/tH5A.f90')
| -rw-r--r-- | fortran/test/tH5A.f90 | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90 index b43707c..5ba2d62 100644 --- a/fortran/test/tH5A.f90 +++ b/fortran/test/tH5A.f90 @@ -117,7 +117,7 @@ CONTAINS ! !general purpose integer ! - INTEGER :: i, j + INTEGER :: i, j, wp INTEGER :: error ! Error flag ! @@ -129,8 +129,6 @@ CONTAINS !data buffers ! INTEGER, DIMENSION(NX,NY) :: data_in - LOGICAL :: differ - ! !Initialize data_in buffer @@ -519,27 +517,22 @@ CONTAINS data_dims(1) = 1 CALL h5aread_f(attr3_id, H5T_NATIVE_DOUBLE, aread_double_data, data_dims, error) CALL check("h5aread_f",error,total_error) - differ = .FALSE. - if(abs(aread_double_data(1)- 3.459D0) .ge. 1.D-08) then - differ = .TRUE. - endif - ! This is a temporary fix - !CALL compare_floats(aread_double_data(1), 3.459D0, differ) - IF (differ) THEN - WRITE(*,*) "Read back double attrbute is wrong", aread_double_data(1) - total_error = total_error + 1 - END IF + + IF( .NOT.(aread_double_data(1) .REALEQ. 3.459_Fortran_DOUBLE) )THEN + WRITE(*,*) "Read back double attrbute is wrong", aread_double_data(1) + total_error = total_error + 1 + ENDIF ! !read the real attribute data back to memory ! data_dims(1) = 1 CALL h5aread_f(attr4_id, H5T_NATIVE_REAL, aread_real_data, data_dims, error) CALL check("h5aread_f",error,total_error) - CALL compare_floats(aread_real_data(1), 4.0, differ) - IF (differ) THEN - WRITE(*,*) "Read back real attrbute is wrong ", aread_real_data - total_error = total_error + 1 - END IF + + IF( .NOT.(aread_real_data(1) .REALEQ. REAL(4.0)) )THEN + WRITE(*,*) "Read back real attrbute is wrong", aread_real_data(1) + total_error = total_error + 1 + ENDIF ! !read the Integer attribute data back to memory ! |