diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-01-27 22:13:23 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-01-27 22:13:23 (GMT) |
commit | dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e (patch) | |
tree | 6ab85c0bdb5105585d589c77359db822ba7409f8 /fortran/test/tH5T_F03.f90 | |
parent | 3ffdf81de41c8a3ebf79a6c593407a8f98dd1b01 (diff) | |
download | hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.zip hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.tar.gz hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.tar.bz2 |
[svn-r24651] Merged changes in the fortran directory from the trunk into the branch,
svn merge -r23351:24650 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran .
Tested: jam (gcc, intel), koala (gcc)
Diffstat (limited to 'fortran/test/tH5T_F03.f90')
-rw-r--r-- | fortran/test/tH5T_F03.f90 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fortran/test/tH5T_F03.f90 b/fortran/test/tH5T_F03.f90 index f7efcc4..a9a6487 100644 --- a/fortran/test/tH5T_F03.f90 +++ b/fortran/test/tH5T_F03.f90 @@ -3137,10 +3137,15 @@ SUBROUTINE t_enum_conv(total_error) ! Enumerated data array ! Some values are out of range for testing. The library should accept them - INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data1 = (/E1_RED, E1_GREEN, E1_BLUE, E1_GREEN, E1_WHITE,& - E1_WHITE, E1_BLACK, E1_GREEN, E1_BLUE, E1_RED,& - E1_RED, E1_BLUE, E1_GREEN, E1_BLACK, E1_WHITE,& - E1_RED, E1_WHITE, INT(0,KIND(E1_RED)), INT(-1,KIND(E1_RED)), INT(-2,KIND(E1_RED))/) + INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data1 = (/INT(E1_RED,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), & + INT(E1_WHITE,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), & + INT(E1_RED,KIND(E1_RED)), INT(E1_RED,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)),& + INT(E1_RED,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), & + INT(0,KIND(E1_RED)), INT(-1,KIND(E1_RED)), INT(-2,KIND(E1_RED))/) ! Reading array for enum data INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data2 |