diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-04-12 03:26:21 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-04-12 03:26:21 (GMT) |
commit | 19c485a128e4d860a537a14c91e38bc87dc6db25 (patch) | |
tree | 7333e607cf9093aa8020f5a2fa9af159379d845a /fortran/testpar | |
parent | 33956e594a10ecab24867ab0c3347452f22b4e11 (diff) | |
download | hdf5-19c485a128e4d860a537a14c91e38bc87dc6db25.zip hdf5-19c485a128e4d860a537a14c91e38bc87dc6db25.tar.gz hdf5-19c485a128e4d860a537a14c91e38bc87dc6db25.tar.bz2 |
[svn-r25027] Merged changes from the trunk to the branch,
svn merge -r24929:25009 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
tested: jam (gnu)
Diffstat (limited to 'fortran/testpar')
-rw-r--r-- | fortran/testpar/Makefile.am | 3 | ||||
-rw-r--r-- | fortran/testpar/Makefile.in | 3 | ||||
-rw-r--r-- | fortran/testpar/hyper.f90 | 3 | ||||
-rw-r--r-- | fortran/testpar/mdset.f90 | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index 2e85f3b..517a3c8 100644 --- a/fortran/testpar/Makefile.am +++ b/fortran/testpar/Makefile.am @@ -21,7 +21,8 @@ include $(top_srcdir)/config/commence.am # Include files -AM_FCFLAGS+=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src +AM_FCFLAGS+=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src \ + $(F9XMODFLAG)$(top_builddir)/fortran/test # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index e078c3a..8ee5e43 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -399,7 +399,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ # Include files AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/fortran/src \ -I$(top_srcdir)/fortran/test \ - $(F9XMODFLAG)$(top_builddir)/fortran/src + $(F9XMODFLAG)$(top_builddir)/fortran/src \ + $(F9XMODFLAG)$(top_builddir)/fortran/test AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1) AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90 index 1a580ca..a2e2e07 100644 --- a/fortran/testpar/hyper.f90 +++ b/fortran/testpar/hyper.f90 @@ -19,7 +19,8 @@ !////////////////////////////////////////////////////////// SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) - USE hdf5 + USE HDF5 + USE TH5_MISC IMPLICIT NONE INCLUDE 'mpif.h' diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90 index 9d14a50..7fe431b 100644 --- a/fortran/testpar/mdset.f90 +++ b/fortran/testpar/mdset.f90 @@ -19,7 +19,8 @@ !////////////////////////////////////////////////////////// SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) - USE hdf5 + USE HDF5 + USE TH5_MISC IMPLICIT NONE INCLUDE 'mpif.h' |