[svn-r24878] Description:

    Bring r24864 from trunk to 1.8 branch:

    Remove all traces of MPI-POSIX VFD and GPFS detection/code.

    Remove remaining traces of stream VFD.

    Remove testpar/t_posix_compliant test (it's not actually verifying anything).

    Clean up H5D__mpio_opt_possible() further.

    Moved environment variable that disables MPI collective operations into
    MPI-IO VFD (instead of it being in src/H5S.c).

    A few other small code cleanups.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/parallel & serial
    (daily tested on trunk)

9 files changed, 1 insertions, 162 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 4196fe2..ca646ce 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -217,7 +217,6 @@ FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
 FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
-GPFS = @GPFS@
 GREP = @GREP@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 1cc0825..53dc2b6 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -188,7 +188,6 @@ FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
 FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
-GPFS = @GPFS@
 GREP = @GREP@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
diff --git a/fortran/src/H5FDmpiof.c b/fortran/src/H5FDmpiof.c
index 993b5ac..bbdb170 100644
--- a/fortran/src/H5FDmpiof.c
+++ b/fortran/src/H5FDmpiof.c
@@ -220,87 +220,6 @@ nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode)
      return ret_value;
 }
 
-/****if* H5FDmpiof/h5pset_fapl_mpiposix_c
- * NAME
- *        h5pset_fapl_mpiposix_c
- * PURPOSE
- *     Call H5Pset_fapl_mpiposix to set mode for parallel I/O and the user
- *              supplied communicator
- * INPUTS
- *      prp_id - property list identifier
- *              comm   - MPI communicator
- *              flag   - flag to use GPFS hints
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, May 6, 2003
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pset_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hbool_t c_flag;
-     MPI_Comm c_comm;
-     c_comm = MPI_Comm_f2c(*comm);
-     c_flag  = (hbool_t)*flag;
-     /*
-      * Call H5Pset_fapl_mpiposix function.
-      */
-     c_prp_id = (hid_t) *prp_id;
-     ret = H5Pset_fapl_mpiposix(c_prp_id, c_comm, c_flag);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-/****if* H5FDmpiof/h5pget_fapl_mpiposix_c
- * NAME
- *        h5pget_fapl_mpiposix_c
- * PURPOSE
- *     Call H5Pget_fapl_mpiposix to retrieve communicator and info object
- * INPUTS
- *      prp_id - property list identifier
- * OUTPUTS
- *     comm   - buffer to return MPI communicator
- *              flag - flag to use GPFS hints
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, May 6, 2003
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pget_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hbool_t c_flag;
-     MPI_Comm c_comm;
-
-     /*
-      * Call H5Pget_fapl_mpiposix function.
-      */
-     c_prp_id = (hid_t) *prp_id;
-     ret = H5Pget_fapl_mpiposix(c_prp_id, &c_comm, &c_flag);
-     if (ret < 0) return ret_value;
-     *comm = (int_f) MPI_Comm_c2f(c_comm);
-     *flag = (int_f) c_flag;
-     ret_value = 0;
-     return ret_value;
-}
-
 /****if* H5Pf/h5pget_mpio_actual_io_mode_c
  * NAME
  *  h5pget_mpio_actual_io_mode_c
diff --git a/fortran/src/H5FDmpioff.f90 b/fortran/src/H5FDmpioff.f90
index 5c81bc8..50a77d9 100644
--- a/fortran/src/H5FDmpioff.f90
+++ b/fortran/src/H5FDmpioff.f90
@@ -131,6 +131,7 @@ CONTAINS
     INTEGER, EXTERNAL :: h5pset_dxpl_mpio_c
     hdferr = h5pset_dxpl_mpio_c(prp_id, data_xfer_mode)
   END SUBROUTINE h5pset_dxpl_mpio_f
+
 !****s* H5FDMPIO/h5pget_dxpl_mpio_f
 !
 ! NAME
@@ -164,76 +165,6 @@ CONTAINS
     hdferr = h5pget_dxpl_mpio_c(prp_id, data_xfer_mode)
   END SUBROUTINE h5pget_dxpl_mpio_f
 
-!****s* H5FDMPIO/h5pset_fapl_mpiposix_f
-!
-! NAME
-!  h5pset_fapl_mpiposix_f
-!
-! PURPOSE
-!  Stores MPI IO communicator information to the file
-!  access property list.
-!
-! INPUTS
-!  prp_id    - File access property list identifier.
-!  comm      - MPI-2 communicator.
-!  use_gpfs  - Logical flag to use the GPFS hints.
-! OUTPUTS
-!  hdferr    - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR
-!  Elena Pourmal
-!  May 6, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: prp_id
-    INTEGER,        INTENT(IN)  :: comm
-    LOGICAL,        INTENT(IN)  :: use_gpfs
-    INTEGER,        INTENT(OUT) :: hdferr
-!*****
-    INTEGER :: flag
-    INTEGER, EXTERNAL :: h5pset_fapl_mpiposix_c
-    flag = 0
-    IF(use_gpfs) flag = 1
-    hdferr = h5pset_fapl_mpiposix_c(prp_id, comm, flag)
-  END SUBROUTINE h5pset_fapl_mpiposix_f
-
-!****s* H5FDMPIO/h5pget_fapl_mpiposix_f
-!
-! NAME
-!  h5pget_fapl_mpiposix_f
-!
-! PURPOSE
-!  Returns MPI communicator information.
-!
-! INPUTS
-!  prp_id    - File access property list identifier.
-! OUTPUTS
-!  comm      - MPI-2 communicator.
-!  use_gpfs  - Flag to use GPFS hints.
-!  hdferr    - Returns 0 if successful and -1 if fails.
-! AUTHOR
-!  Elena Pourmal
-!  May 6, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: prp_id
-    INTEGER,        INTENT(OUT) :: comm
-    LOGICAL,        INTENT(OUT) :: use_gpfs
-    INTEGER,        INTENT(OUT) :: hdferr
-!*****
-    INTEGER :: flag
-
-    INTEGER, EXTERNAL :: h5pget_fapl_mpiposix_c
-    hdferr = h5pget_fapl_mpiposix_c(prp_id, comm, flag)
-    use_gpfs = .FALSE.
-    IF (flag .EQ. 1) use_gpfs = .TRUE.
-  END SUBROUTINE h5pget_fapl_mpiposix_f
-
-
 !****s* H5P/h5pget_mpio_actual_io_mode_f
 ! NAME
 !  h5pget_mpio_actual_io_mode_f
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 4b02b6c..c533452 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -914,8 +914,6 @@ H5_FCDLL int_f nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *
 #define nh5pset_btree_ratios_c         H5_FC_FUNC_(h5pset_btree_ratios_c, H5PSET_BTREE_RATIOS_C)
 #define nh5pset_fapl_mpio_c         H5_FC_FUNC_(h5pset_fapl_mpio_c, H5PSET_FAPL_MPIO_C)
 #define nh5pget_fapl_mpio_c         H5_FC_FUNC_(h5pget_fapl_mpio_c, H5PGET_FAPL_MPIO_C)
-#define nh5pset_fapl_mpiposix_c     H5_FC_FUNC_(h5pset_fapl_mpiposix_c, H5PSET_FAPL_MPIPOSIX_C)
-#define nh5pget_fapl_mpiposix_c     H5_FC_FUNC_(h5pget_fapl_mpiposix_c, H5PGET_FAPL_MPIPOSIX_C)
 #define nh5pset_dxpl_mpio_c        H5_FC_FUNC_(h5pset_dxpl_mpio_c, H5PSET_DXPL_MPIO_C)
 #define nh5pget_dxpl_mpio_c        H5_FC_FUNC_(h5pget_dxpl_mpio_c, H5PGET_DXPL_MPIO_C)
 #define nh5pget_fclose_degree_c    H5_FC_FUNC_(h5pget_fclose_degree_c, H5PGET_FCLOSE_DEGREE_C)
@@ -1072,8 +1070,6 @@ H5_FCDLL int_f nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* mid
 H5_FCDLL int_f nh5pset_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
 H5_FCDLL int_f nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info);
 H5_FCDLL int_f nh5pset_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info);
-H5_FCDLL int_f nh5pget_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag);
-H5_FCDLL int_f nh5pset_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag);
 H5_FCDLL int_f nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode);
 H5_FCDLL int_f nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode);
 H5_FCDLL int_f nh5pset_fclose_degree_c(hid_t_f *fapl, int_f *degree);
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 5db905c..2e3725b 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -307,7 +307,6 @@ FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
 FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
-GPFS = @GPFS@
 GREP = @GREP@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 62030f0..c549d34 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -567,6 +567,4 @@ H5Z_mp_H5ZGET_FILTER_INFO_F
 @H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIO_F

 @H5_NOPAREXP@H5FDMPIO_mp_H5PSET_DXPL_MPIO_F

 @H5_NOPAREXP@H5FDMPIO_mp_H5PGET_DXPL_MPIO_F

-@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_FAPL_MPIPOSIX_F

-@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIPOSIX_F

 @H5_NOPAREXP@H5FDMPIO_mp_H5PGET_MPIO_ACTUAL_IO_MODE_F

diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 9f8b6d0..9db74e8 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -291,7 +291,6 @@ FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
 FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
-GPFS = @GPFS@
 GREP = @GREP@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 1903529..60f24b9 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -215,7 +215,6 @@ FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
 FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
-GPFS = @GPFS@
 GREP = @GREP@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@