diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2005-12-04 02:27:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-12-04 02:27:37 (GMT) |
| commit | 8d344f96bcd012742c55e668d6a6b3d81d1c39ee (patch) | |
| tree | 918447ffaa4d7a81b921dac1a9a0d9a4f380760d /fortran | |
| parent | 4620776d72dc398dd134f4b266a38350d6cb7f60 (diff) | |
| download | hdf5-8d344f96bcd012742c55e668d6a6b3d81d1c39ee.zip hdf5-8d344f96bcd012742c55e668d6a6b3d81d1c39ee.tar.gz hdf5-8d344f96bcd012742c55e668d6a6b3d81d1c39ee.tar.bz2 | |
[svn-r11758] Purpose:
New feature
Description:
Add in a combination of Peter's & my code to support copying
variable-length data from one file to another, although currently only
supported with contiguous data storage.
Platforms tested:
FreeBSD 4.11 (sleipnir)
h5committest
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5Rff.f90 | 16 | ||||
| -rw-r--r-- | fortran/src/H5_f.c | 8 | ||||
| -rw-r--r-- | fortran/src/H5f90global.f90 | 10 | ||||
| -rw-r--r-- | fortran/test/tH5R.f90 | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90 index 08c85df..a41f8dc 100644 --- a/fortran/src/H5Rff.f90 +++ b/fortran/src/H5Rff.f90 @@ -410,10 +410,10 @@ ! Outputs: ! obj_type - object_type, possible values: ! H5G_UNKNOWN_F (-1) -! H5G_LINK_F 0 -! H5G_GROUP_F 1 -! H5G_DATASET_F 2 -! H5G_TYPE_F 3 +! H5G_GROUP_F 0 +! H5G_DATASET_F 1 +! H5G_TYPE_F 2 +! H5G_LINK_F 3 ! ! hdferr: - error code ! Success: 0 @@ -445,10 +445,10 @@ TYPE(hobj_ref_t_f), INTENT(IN) :: ref ! Object reference INTEGER, INTENT(OUT) :: obj_type ! Object type ! H5G_UNKNOWN_F (-1) - ! H5G_LINK_F 0 - ! H5G_GROUP_F 1 - ! H5G_DATASET_F 2 - ! H5G_TYPE_F 3 + ! H5G_GROUP_F 0 + ! H5G_DATASET_F 1 + ! H5G_TYPE_F 2 + ! H5G_LINK_F 3 INTEGER, INTENT(OUT) :: hdferr ! Error code INTEGER(HADDR_T) :: ref_f ! Local buffer to pass reference diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index 0e5c4cb..1543e18 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -298,10 +298,10 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, */ h5g_flags[0] = H5G_UNKNOWN; - h5g_flags[1] = H5G_LINK; - h5g_flags[2] = H5G_GROUP; - h5g_flags[3] = H5G_DATASET; - h5g_flags[4] = H5G_TYPE; + h5g_flags[1] = H5G_GROUP; + h5g_flags[2] = H5G_DATASET; + h5g_flags[3] = H5G_TYPE; + h5g_flags[4] = H5G_LINK; h5g_flags[5] = H5G_LINK_ERROR; h5g_flags[6] = H5G_LINK_HARD; h5g_flags[7] = H5G_LINK_SOFT; diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index ebd3c93..9503e97 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -201,19 +201,19 @@ COMMON /H5G_FLAGS/ H5G_flags INTEGER :: H5G_UNKNOWN_F - INTEGER :: H5G_LINK_F INTEGER :: H5G_GROUP_F INTEGER :: H5G_DATASET_F INTEGER :: H5G_TYPE_F + INTEGER :: H5G_LINK_F INTEGER :: H5G_LINK_ERROR_F INTEGER :: H5G_LINK_HARD_F INTEGER :: H5G_LINK_SOFT_F EQUIVALENCE(H5G_flags(1), H5G_UNKNOWN_F) - EQUIVALENCE(H5G_flags(2), H5G_LINK_F) - EQUIVALENCE(H5G_flags(3), H5G_GROUP_F) - EQUIVALENCE(H5G_flags(4), H5G_DATASET_F) - EQUIVALENCE(H5G_flags(5), H5G_TYPE_F) + EQUIVALENCE(H5G_flags(2), H5G_GROUP_F) + EQUIVALENCE(H5G_flags(3), H5G_DATASET_F) + EQUIVALENCE(H5G_flags(4), H5G_TYPE_F) + EQUIVALENCE(H5G_flags(5), H5G_LINK_F) EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F) EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F) EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F) diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90 index d4f2911..7daabc6 100644 --- a/fortran/test/tH5R.f90 +++ b/fortran/test/tH5R.f90 @@ -158,7 +158,7 @@ ! CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error) CALL check("h5rget_object_type_f",error,total_error) - if (obj_type == 2) then + if (obj_type == H5G_DATASET_F) then CALL h5rdereference_f(dsetr_id, ref(3), dset1_id, error) CALL check("h5rdereference_f",error,total_error) @@ -172,7 +172,7 @@ ! CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error) CALL check("h5rget_object_type_f",error,total_error) - if (obj_type == 3) then + if (obj_type == H5G_TYPE_F) then CALL h5rdereference_f(dsetr_id, ref(4), type_id, error) CALL check("h5rdereference_f",error,total_error) end if |