From 51bb0fe2d2d03b5744d0358f379ec3139090503c Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 28 Sep 2012 15:42:33 -0500 Subject: [svn-r22843] Renamed variable to match C. Tested: jam (gnu, mpich) --- fortran/src/H5f90global.f90 | 4 ++-- fortran/testpar/hyper.f90 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 435aa6d..a6168d52 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -393,7 +393,7 @@ MODULE H5GLOBAL INTEGER :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F INTEGER :: H5D_CHUNK_CACHE_NBYTES_DFLT_F INTEGER :: H5D_CHUNK_CACHE_W0_DFLT_F - INTEGER :: H5D_MPIO_NO_COLLECTIVE_IO_F + INTEGER :: H5D_MPIO_NO_COLLECTIVE_F INTEGER :: H5D_MPIO_CHUNK_INDEPENDENT_F INTEGER :: H5D_MPIO_CHUNK_COLLECTIVE_F INTEGER :: H5D_MPIO_CHUNK_MIXED_F @@ -426,7 +426,7 @@ MODULE H5GLOBAL EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_NSLOTS_DFLT_F) EQUIVALENCE(H5D_flags(21), H5D_CHUNK_CACHE_NBYTES_DFLT_F) EQUIVALENCE(H5D_flags(22), H5D_CHUNK_CACHE_W0_DFLT_F) - EQUIVALENCE(H5D_flags(23), H5D_MPIO_NO_COLLECTIVE_IO_F) + EQUIVALENCE(H5D_flags(23), H5D_MPIO_NO_COLLECTIVE_F) EQUIVALENCE(H5D_flags(24), H5D_MPIO_CHUNK_INDEPENDENT_F) EQUIVALENCE(H5D_flags(25), H5D_MPIO_CHUNK_COLLECTIVE_F) EQUIVALENCE(H5D_flags(26), H5D_MPIO_CHUNK_MIXED_F) diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90 index 650a088..1a580ca 100644 --- a/fortran/testpar/hyper.f90 +++ b/fortran/testpar/hyper.f90 @@ -190,7 +190,7 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors) ENDIF ELSEIF(.NOT.do_collective)THEN - IF(actual_io_mode.NE.H5D_MPIO_NO_COLLECTIVE_IO_F)THEN + IF(actual_io_mode.NE.H5D_MPIO_NO_COLLECTIVE_F)THEN CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors) ENDIF ELSEIF( do_collective.AND.(.NOT.do_chunk))THEN -- cgit v0.12