diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
commit | 42efc1c2b591e4cd45ec6cb3bdf32044343118d2 (patch) | |
tree | 0ab542871c32246199479e8933ff26286aaf629a /fortran/testpar | |
parent | 3360c3af0c100ac4d3a2fe2865f34661da862ec5 (diff) | |
download | hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.zip hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.gz hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.bz2 |
[svn-r18451] Description:
Bring r18172:18446 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/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) 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
Diffstat (limited to 'fortran/testpar')
-rw-r--r-- | fortran/testpar/hyper.f90 | 26 | ||||
-rw-r--r-- | fortran/testpar/mdset.f90 | 26 | ||||
-rw-r--r-- | fortran/testpar/ptest.f90 | 14 |
3 files changed, 33 insertions, 33 deletions
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90 index a6d72dd..1d65ae1 100644 --- a/fortran/testpar/hyper.f90 +++ b/fortran/testpar/hyper.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,11 +11,11 @@ ! is linked from the top-level documents page. It can also be found at * ! http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * ! access to either file, you may request a copy from help@hdfgroup.org. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * !////////////////////////////////////////////////////////// -! writes/reads dataset by hyperslabs +! writes/reads dataset by hyperslabs !////////////////////////////////////////////////////////// SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) @@ -26,8 +26,8 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) INTEGER, INTENT(in) :: length ! array length LOGICAL, INTENT(in) :: do_collective ! use collective I/O LOGICAL, INTENT(in) :: do_chunk ! use chunking - INTEGER, INTENT(in) :: mpi_size ! number of processes in the group of communicator - INTEGER, INTENT(in) :: mpi_rank ! rank of the calling process in the communicator + INTEGER, INTENT(in) :: mpi_size ! number of processes in the group of communicator + INTEGER, INTENT(in) :: mpi_rank ! rank of the calling process in the communicator INTEGER, INTENT(inout) :: nerrors ! number of errors INTEGER :: mpierror ! MPI hdferror flag INTEGER :: hdferror ! HDF hdferror flag @@ -35,17 +35,17 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) INTEGER(hsize_t), DIMENSION(1) :: cdims ! chunk dimensions INTEGER, ALLOCATABLE :: wbuf(:) ! write buffer INTEGER, ALLOCATABLE :: rbuf(:) ! read buffer - INTEGER(hsize_t), DIMENSION(1) :: counti ! hyperslab selection - INTEGER(hsize_t), DIMENSION(1) :: start ! hyperslab selection + INTEGER(hsize_t), DIMENSION(1) :: counti ! hyperslab selection + INTEGER(hsize_t), DIMENSION(1) :: start ! hyperslab selection INTEGER(hid_t) :: fapl_id ! file access identifier - INTEGER(hid_t) :: dxpl_id ! dataset transfer property list - INTEGER(hid_t) :: dcpl_id ! dataset creation property list + INTEGER(hid_t) :: dxpl_id ! dataset transfer property list + INTEGER(hid_t) :: dcpl_id ! dataset creation property list INTEGER(hid_t) :: file_id ! file identifier INTEGER(hid_t) :: dset_id ! dataset identifier INTEGER(hid_t) :: fspace_id ! file space identifier INTEGER(hid_t) :: mspace_id ! memory space identifier INTEGER(hid_t) :: driver_id ! low-level file driver identifier - INTEGER :: istart ! start position in array + INTEGER :: istart ! start position in array INTEGER :: iend ! end position in array INTEGER :: icount ! number of elements in array CHARACTER(len=80) :: filename ! filename @@ -139,11 +139,11 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) CALL check("h5dcreate_f", hdferror, nerrors) !////////////////////////////////////////////////////////// - ! define hyperslab + ! define hyperslab !////////////////////////////////////////////////////////// - counti(1) = icount - start(1) = istart + counti(1) = icount + start(1) = istart !////////////////////////////////////////////////////////// ! select hyperslab in memory diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90 index dcc7210..9d14a50 100644 --- a/fortran/testpar/mdset.f90 +++ b/fortran/testpar/mdset.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,11 +11,11 @@ ! is linked from the top-level documents page. It can also be found at * ! http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * ! access to either file, you may request a copy from help@hdfgroup.org. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * !////////////////////////////////////////////////////////// -! writes/reads dataset by hyperslabs +! writes/reads dataset by hyperslabs !////////////////////////////////////////////////////////// SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) @@ -26,8 +26,8 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra INTEGER, INTENT(in) :: length ! array length LOGICAL, INTENT(in) :: do_collective ! use collective I/O LOGICAL, INTENT(in) :: do_chunk ! use chunking - INTEGER, INTENT(in) :: mpi_size ! number of processes in the group of communicator - INTEGER, INTENT(in) :: mpi_rank ! rank of the calling process in the communicator + INTEGER, INTENT(in) :: mpi_size ! number of processes in the group of communicator + INTEGER, INTENT(in) :: mpi_rank ! rank of the calling process in the communicator INTEGER, INTENT(inout) :: nerrors ! number of errors INTEGER :: mpierror ! MPI hdferror flag INTEGER :: hdferror ! HDF hdferror flag @@ -35,17 +35,17 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra INTEGER(hsize_t), DIMENSION(1) :: cdims ! chunk dimensions INTEGER, ALLOCATABLE :: wbuf(:) ! write buffer INTEGER, ALLOCATABLE :: rbuf(:) ! read buffer - INTEGER(hsize_t), DIMENSION(1) :: counti ! hyperslab selection - INTEGER(hsize_t), DIMENSION(1) :: start ! hyperslab selection + INTEGER(hsize_t), DIMENSION(1) :: counti ! hyperslab selection + INTEGER(hsize_t), DIMENSION(1) :: start ! hyperslab selection INTEGER(hid_t) :: fapl_id ! file access identifier - INTEGER(hid_t) :: dxpl_id ! dataset transfer property list - INTEGER(hid_t) :: dcpl_id ! dataset creation property list + INTEGER(hid_t) :: dxpl_id ! dataset transfer property list + INTEGER(hid_t) :: dcpl_id ! dataset creation property list INTEGER(hid_t) :: file_id ! file identifier INTEGER(hid_t) :: dset_id ! dataset identifier INTEGER(hid_t) :: fspace_id ! file space identifier INTEGER(hid_t) :: mspace_id ! memory space identifier INTEGER(hid_t) :: driver_id ! low-level file driver identifier - INTEGER :: istart ! start position in array + INTEGER :: istart ! start position in array INTEGER :: iend ! end position in array INTEGER :: icount ! number of elements in array CHARACTER(len=80) :: filename ! filename @@ -141,11 +141,11 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra ENDIF !////////////////////////////////////////////////////////// - ! define hyperslab + ! define hyperslab !////////////////////////////////////////////////////////// - counti(1) = icount - start(1) = istart + counti(1) = icount + start(1) = istart !////////////////////////////////////////////////////////// ! select hyperslab in memory diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90 index 6f6fb2e..e474668 100644 --- a/fortran/testpar/ptest.f90 +++ b/fortran/testpar/ptest.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,7 +11,7 @@ ! is linked from the top-level documents page. It can also be found at * ! http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * ! access to either file, you may request a copy from help@hdfgroup.org. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * !////////////////////////////////////////////////////////// ! main program for parallel HDF5 Fortran tests @@ -27,8 +27,8 @@ PROGRAM parallel_test LOGICAL :: do_collective ! use collective MPI I/O LOGICAL :: do_chunk ! use chunking INTEGER :: nerrors = 0 ! number of errors - INTEGER :: mpi_size ! number of processes in the group of communicator - INTEGER :: mpi_rank ! rank of the calling process in the communicator + INTEGER :: mpi_size ! number of processes in the group of communicator + INTEGER :: mpi_rank ! rank of the calling process in the communicator INTEGER :: length = 12000 ! length of array !////////////////////////////////////////////////////////// @@ -115,20 +115,20 @@ PROGRAM parallel_test !////////////////////////////////////////////////////////// IF (nerrors == 0) THEN - CALL mpi_finalize(mpierror) + CALL mpi_finalize(mpierror) IF (mpierror .NE. MPI_SUCCESS) THEN WRITE(*,*) "MPI_FINALIZE *FAILED* Process = ", mpi_rank ENDIF ELSE WRITE(*,*) 'Errors detected in process ', mpi_rank - CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror) + CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror) IF (mpierror .NE. MPI_SUCCESS) THEN WRITE(*,*) "MPI_ABORT *FAILED* Process = ", mpi_rank ENDIF ENDIF !////////////////////////////////////////////////////////// - ! end main program + ! end main program !////////////////////////////////////////////////////////// END PROGRAM parallel_test |