From 9ab525f8a4babdd2ff22ee72577997838476d275 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 11 Feb 1998 23:52:59 -0500 Subject: [svn-r257] H5F.c: Added modification entry to H5F_open header. Should have been done when i added the access template argument. H5Fprivate.h: The hardcode setting to "define MPIO as the default IO when HAVE_PARALLEL is set" cause all test programs to fail since none of them is coded with the needed MPI_Initialize. Change it back to the previous setting of using sequential I/O allows user to use sequential I/O by default and use MPIO only if he/she explicitely asks for it via access template setting. --- src/H5F.c | 6 ++++++ src/H5Fprivate.h | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/H5F.c b/src/H5F.c index fd922a5..68fa02e 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -510,6 +510,8 @@ H5F_dest(H5F_t *f) * The CREATE_PARMS argument is optional. A null pointer will * cause the default file creation parameters to be used. * + * The ACCESS_PARMS argument is not used yet. + * * The TYPE argument determins the low-level type of file that * is opened. The special value H5F_LOW_DFLT uses the default * method which is defined at compile time. @@ -565,6 +567,10 @@ H5F_dest(H5F_t *f) * assumed to be a family of files. The TYPE argument is ignored and * H5F_LOW_FAM is used instead. * + * Albert Cheng, 5 Feb 1998 + * Added the access_parms argument to pass down access template + * information. + * *------------------------------------------------------------------------- */ H5F_t * diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 7a7d8ea..14c7e72 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -22,12 +22,6 @@ /* This is a near top-level header! Try not to include much! */ #include -#ifdef HAVE_PARALLEL -#ifndef MPI_SUCCESS -#include -#include -#endif -#endif /* * Feature: Define this constant to be non-zero if you want to enable code @@ -327,11 +321,7 @@ typedef struct H5F_low_t { /* What types of low-level files are there? */ #ifndef H5F_LOW_DFLT -# ifdef HAVE_PARALLEL -# define H5F_LOW_DFLT H5F_LOW_MPIO /* when parallel, MPI-IO is default */ -# else # define H5F_LOW_DFLT H5F_LOW_STDIO /* The default type */ -# endif #endif extern const H5F_low_class_t H5F_LOW_SEC2[]; /* Posix section 2 */ extern const H5F_low_class_t H5F_LOW_STDIO[]; /* Posix stdio */ -- cgit v0.12