diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2001-06-28 15:12:08 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2001-06-28 15:12:08 (GMT) |
| commit | 1b717e9452132c54c6a68361d1c2308106217a0b (patch) | |
| tree | c4e3460b30dca10edb38c0e52e30f39b6c874aa8 | |
| parent | 12c718ace34fce3a90b7a9873a41a9767f8f07af (diff) | |
| download | hdf5-1b717e9452132c54c6a68361d1c2308106217a0b.zip hdf5-1b717e9452132c54c6a68361d1c2308106217a0b.tar.gz hdf5-1b717e9452132c54c6a68361d1c2308106217a0b.tar.bz2 | |
[svn-r4075]
Purpose:
Sync with hdf5 1.4. branch
Description:
Brought changes made in the hdf5 1.4. branch into 1.5
| -rw-r--r-- | fortran/testpar/Makefile.in | 2 | ||||
| -rw-r--r-- | fortran/testpar/thyperslab_wr.f90 | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 2e57b95..0848c94 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -42,6 +42,6 @@ $(TEST_PROGS): $(LIBHDF5) $(LIBH5TEST) $(TEST_OBJ): $(TEST_HDR) ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo tcheck.lo ptesthdf5_fortran.lo - @$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thyperslab_wr.lo tcheck.lo $(LIBFORTRAN) $(LIBHDF5) $(LIBS) + @$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo tcheck.lo $(LIBFORTRAN) $(LIBHDF5) $(LIBS) @CONCLUDE@ diff --git a/fortran/testpar/thyperslab_wr.f90 b/fortran/testpar/thyperslab_wr.f90 index 9375a11..b6da747 100644 --- a/fortran/testpar/thyperslab_wr.f90 +++ b/fortran/testpar/thyperslab_wr.f90 @@ -23,6 +23,7 @@ INTEGER, ALLOCATABLE :: data_out (:,:) ! Buffer to store data INTEGER :: rank = 2 ! Dataset rank INTEGER :: i, j + INTEGER :: dims(7) INTEGER :: total_error, error ! Error flags ! @@ -85,6 +86,8 @@ ! Initialize data buffer with trivial data. ! ALLOCATE ( data(count(1),count(2))) + dims(1) = count(1) + dims(2) = count(2) data = mpi_rank + 10 ! ! Create property list for collective dataset write @@ -97,7 +100,7 @@ ! ! Write the dataset collectively. ! - CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, error, & + CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, dims, error, & file_space_id = filespace, mem_space_id = memspace, xfer_prp = plxfer_id) CALL check("h5dwrite_f", error, total_error) ! @@ -178,7 +181,7 @@ ! ! Write the dataset collectively. ! - CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, error, & + CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, dims, error, & file_space_id = filespace, mem_space_id = memspace, xfer_prp = plxfer_id) CALL check("h5dread_f", error, total_error) do j = 1, count(2) |