From 68631b6e95d2000cf5134da37b18ca9d5b334e14 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 2 Feb 2015 13:52:35 -0500 Subject: [svn-r26113] Updated configure and the parallel tests to 'USE mpi' instead of 'include 'mpih.f' tested jam (mpich + gnu). --- fortran/testpar/hyper.f90 | 2 +- fortran/testpar/mdset.f90 | 2 +- fortran/testpar/ptest.f90 | 2 +- m4/aclocal_fc.m4 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90 index a2e2e07..a03095a 100644 --- a/fortran/testpar/hyper.f90 +++ b/fortran/testpar/hyper.f90 @@ -21,8 +21,8 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) USE HDF5 USE TH5_MISC + USE mpi IMPLICIT NONE - INCLUDE 'mpif.h' INTEGER, INTENT(in) :: length ! array length LOGICAL, INTENT(in) :: do_collective ! use collective I/O diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90 index 7fe431b..f24c862 100644 --- a/fortran/testpar/mdset.f90 +++ b/fortran/testpar/mdset.f90 @@ -21,8 +21,8 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) USE HDF5 USE TH5_MISC + USE mpi IMPLICIT NONE - INCLUDE 'mpif.h' INTEGER, INTENT(in) :: length ! array length LOGICAL, INTENT(in) :: do_collective ! use collective I/O diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90 index e474668..145d084 100644 --- a/fortran/testpar/ptest.f90 +++ b/fortran/testpar/ptest.f90 @@ -19,8 +19,8 @@ PROGRAM parallel_test USE hdf5 + USE mpi IMPLICIT NONE - INCLUDE 'mpif.h' INTEGER :: mpierror ! MPI hdferror flag INTEGER :: hdferror ! HDF hdferror flag diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4 index b5e5cfa..03bd026 100644 --- a/m4/aclocal_fc.m4 +++ b/m4/aclocal_fc.m4 @@ -268,7 +268,7 @@ dnl Try link a simple MPI program. AC_MSG_CHECKING([whether a simple MPI-IO Fortran program can be linked]) AC_LINK_IFELSE([ PROGRAM main - include 'mpif.h' + USE mpi INTEGER :: comm, amode, info, fh, ierror CHARACTER(LEN=1) :: filename CALL MPI_File_open( comm, filename, amode, info, fh, ierror) -- cgit v0.12