diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-09-24 11:25:37 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-09-24 11:25:37 (GMT) |
commit | f1360e4d06c6e75a3ee51f5e79973aaed9b53800 (patch) | |
tree | c67bde83e84f7cb9a1e8c2301aeff05d9f789091 /fortran | |
parent | dfa5cb68c0582a402b520deba65a7fef12ee740e (diff) | |
download | hdf5-f1360e4d06c6e75a3ee51f5e79973aaed9b53800.zip hdf5-f1360e4d06c6e75a3ee51f5e79973aaed9b53800.tar.gz hdf5-f1360e4d06c6e75a3ee51f5e79973aaed9b53800.tar.bz2 |
[svn-r17515] Description:
Bring r17496:17514 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/src/H5_f.c | 42 | ||||
-rw-r--r-- | fortran/src/H5f90global.f90 | 44 |
2 files changed, 45 insertions, 41 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index a8b2d95..e0748b5b 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -557,26 +557,28 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, h5t_flags[10] = (int_f)H5T_ORDER_LE; h5t_flags[11] = (int_f)H5T_ORDER_BE; h5t_flags[12] = (int_f)H5T_ORDER_VAX; - h5t_flags[13] = (int_f)H5T_PAD_ZERO; - h5t_flags[14] = (int_f)H5T_PAD_ONE; - h5t_flags[15] = (int_f)H5T_PAD_BACKGROUND; - h5t_flags[16] = (int_f)H5T_PAD_ERROR; - h5t_flags[17] = (int_f)H5T_SGN_NONE; - h5t_flags[18] = (int_f)H5T_SGN_2; - h5t_flags[19] = (int_f)H5T_SGN_ERROR; - h5t_flags[20] = (int_f)H5T_NORM_IMPLIED; - h5t_flags[21] = (int_f)H5T_NORM_MSBSET; - h5t_flags[22] = (int_f)H5T_NORM_NONE; - h5t_flags[23] = (int_f)H5T_CSET_ASCII; - h5t_flags[24] = (int_f)H5T_CSET_UTF8; - h5t_flags[25] = (int_f)H5T_STR_NULLTERM; - h5t_flags[26] = (int_f)H5T_STR_NULLPAD; - h5t_flags[27] = (int_f)H5T_STR_SPACEPAD; - h5t_flags[28] = (int_f)H5T_STR_ERROR; - h5t_flags[29] = (int_f)H5T_VLEN; - h5t_flags[30] = (int_f)H5T_ARRAY; - h5t_flags[31] = (int_f)H5T_DIR_ASCEND; - h5t_flags[32] = (int_f)H5T_DIR_DESCEND; + h5t_flags[13] = (int_f)H5T_ORDER_NONE; + h5t_flags[14] = (int_f)H5T_PAD_ZERO; + h5t_flags[15] = (int_f)H5T_PAD_ONE; + h5t_flags[16] = (int_f)H5T_PAD_BACKGROUND; + h5t_flags[17] = (int_f)H5T_PAD_ERROR; + h5t_flags[18] = (int_f)H5T_SGN_NONE; + h5t_flags[19] = (int_f)H5T_SGN_2; + h5t_flags[20] = (int_f)H5T_SGN_ERROR; + h5t_flags[21] = (int_f)H5T_NORM_IMPLIED; + h5t_flags[22] = (int_f)H5T_NORM_MSBSET; + h5t_flags[23] = (int_f)H5T_NORM_NONE; + h5t_flags[24] = (int_f)H5T_CSET_ASCII; + h5t_flags[25] = (int_f)H5T_CSET_UTF8; + h5t_flags[26] = (int_f)H5T_STR_NULLTERM; + h5t_flags[27] = (int_f)H5T_STR_NULLPAD; + h5t_flags[28] = (int_f)H5T_STR_SPACEPAD; + h5t_flags[29] = (int_f)H5T_STR_ERROR; + h5t_flags[30] = (int_f)H5T_VLEN; + h5t_flags[31] = (int_f)H5T_ARRAY; + h5t_flags[32] = (int_f)H5T_DIR_ASCEND; + h5t_flags[33] = (int_f)H5T_DIR_DESCEND; + /* * H5Z flags */ diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 3fc247f..28d00f7 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -687,7 +687,7 @@ MODULE H5GLOBAL ! ! H5T flags declaration ! - INTEGER, PARAMETER :: H5T_FLAGS_LEN = 33 + INTEGER, PARAMETER :: H5T_FLAGS_LEN = 34 INTEGER H5T_flags(H5T_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ATTRIBUTES DLLEXPORT :: /H5T_FLAGS/ @@ -709,6 +709,7 @@ MODULE H5GLOBAL INTEGER :: H5T_ORDER_LE_F INTEGER :: H5T_ORDER_BE_F INTEGER :: H5T_ORDER_VAX_F + INTEGER :: H5T_ORDER_NONE_F INTEGER :: H5T_PAD_ZERO_F INTEGER :: H5T_PAD_ONE_F INTEGER :: H5T_PAD_BACKGROUND_F @@ -741,26 +742,27 @@ MODULE H5GLOBAL EQUIVALENCE(H5T_flags(11), H5T_ORDER_LE_F) EQUIVALENCE(H5T_flags(12), H5T_ORDER_BE_F) EQUIVALENCE(H5T_flags(13), H5T_ORDER_VAX_F) - EQUIVALENCE(H5T_flags(14), H5T_PAD_ZERO_F) - EQUIVALENCE(H5T_flags(15), H5T_PAD_ONE_F) - EQUIVALENCE(H5T_flags(16), H5T_PAD_BACKGROUND_F) - EQUIVALENCE(H5T_flags(17), H5T_PAD_ERROR_F) - EQUIVALENCE(H5T_flags(18), H5T_SGN_NONE_F) - EQUIVALENCE(H5T_flags(19), H5T_SGN_2_F) - EQUIVALENCE(H5T_flags(20), H5T_SGN_ERROR_F) - EQUIVALENCE(H5T_flags(21), H5T_NORM_IMPLIED_F) - EQUIVALENCE(H5T_flags(22), H5T_NORM_MSBSET_F) - EQUIVALENCE(H5T_flags(23), H5T_NORM_NONE_F) - EQUIVALENCE(H5T_flags(24), H5T_CSET_ASCII_F) - EQUIVALENCE(H5T_flags(25), H5T_CSET_UTF8_F) - EQUIVALENCE(H5T_flags(26), H5T_STR_NULLTERM_F) - EQUIVALENCE(H5T_flags(27), H5T_STR_NULLPAD_F) - EQUIVALENCE(H5T_flags(28), H5T_STR_SPACEPAD_F) - EQUIVALENCE(H5T_flags(29), H5T_STR_ERROR_F) - EQUIVALENCE(H5T_flags(30), H5T_VLEN_F) - EQUIVALENCE(H5T_flags(31), H5T_ARRAY_F) - EQUIVALENCE(H5T_flags(32), H5T_DIR_ASCEND_F) - EQUIVALENCE(H5T_flags(33), H5T_DIR_DESCEND_F) + EQUIVALENCE(H5T_flags(14), H5T_ORDER_NONE_F) + EQUIVALENCE(H5T_flags(15), H5T_PAD_ZERO_F) + EQUIVALENCE(H5T_flags(16), H5T_PAD_ONE_F) + EQUIVALENCE(H5T_flags(17), H5T_PAD_BACKGROUND_F) + EQUIVALENCE(H5T_flags(18), H5T_PAD_ERROR_F) + EQUIVALENCE(H5T_flags(19), H5T_SGN_NONE_F) + EQUIVALENCE(H5T_flags(20), H5T_SGN_2_F) + EQUIVALENCE(H5T_flags(21), H5T_SGN_ERROR_F) + EQUIVALENCE(H5T_flags(22), H5T_NORM_IMPLIED_F) + EQUIVALENCE(H5T_flags(23), H5T_NORM_MSBSET_F) + EQUIVALENCE(H5T_flags(24), H5T_NORM_NONE_F) + EQUIVALENCE(H5T_flags(25), H5T_CSET_ASCII_F) + EQUIVALENCE(H5T_flags(26), H5T_CSET_UTF8_F) + EQUIVALENCE(H5T_flags(27), H5T_STR_NULLTERM_F) + EQUIVALENCE(H5T_flags(28), H5T_STR_NULLPAD_F) + EQUIVALENCE(H5T_flags(29), H5T_STR_SPACEPAD_F) + EQUIVALENCE(H5T_flags(30), H5T_STR_ERROR_F) + EQUIVALENCE(H5T_flags(31), H5T_VLEN_F) + EQUIVALENCE(H5T_flags(32), H5T_ARRAY_F) + EQUIVALENCE(H5T_flags(33), H5T_DIR_ASCEND_F) + EQUIVALENCE(H5T_flags(34), H5T_DIR_DESCEND_F) ! ! H5Z flags declaration |