diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 1999-09-03 00:15:57 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 1999-09-03 00:15:57 (GMT) |
| commit | cb0a0eb41eb61e75ddb7a10532e910394babe995 (patch) | |
| tree | c0122b29efeacfc3d8da4c8b07bdd7ce0065db9e /src/H5D.c | |
| parent | d0c5506d95aee19238c21d5cde4ee19ba0539f2a (diff) | |
| download | hdf5-cb0a0eb41eb61e75ddb7a10532e910394babe995.zip hdf5-cb0a0eb41eb61e75ddb7a10532e910394babe995.tar.gz hdf5-cb0a0eb41eb61e75ddb7a10532e910394babe995.tar.bz2 | |
[svn-r1627] Cleanup some minor bugs in the MPIO file-driver ported by Robb.
It is working now. Still need to tie up some loose ends.
Diffstat (limited to 'src/H5D.c')
| -rw-r--r-- | src/H5D.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1509,14 +1509,14 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, #ifdef HAVE_PARALLEL { - /* Collective access is not permissible with the MPIO driver */ + /* Collective access is not permissible without the MPIO driver */ H5FD_mpio_dxpl_t *dx; - if (H5FD_MPIO==dataset->ent.file->shared->lf->driver_id && - H5FD_MPIO==xfer_parms->driver_id && + if (H5FD_MPIO==xfer_parms->driver_id && (dx=xfer_parms->driver_info) && H5FD_MPIO_COLLECTIVE==dx->xfer_mode) { - HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, - "collective access not permissible"); + if (H5FD_MPIO!=dataset->ent.file->shared->lf->driver_id) + HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, + "collective access for MPIO driver only"); } } #endif @@ -1916,14 +1916,14 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, #ifdef HAVE_PARALLEL { - /* Collective access is not permissible with the MPIO driver */ + /* Collective access is not permissible without the MPIO driver */ H5FD_mpio_dxpl_t *dx; - if (H5FD_MPIO==dataset->ent.file->shared->lf->driver_id && - H5FD_MPIO==xfer_parms->driver_id && + if (H5FD_MPIO==xfer_parms->driver_id && (dx=xfer_parms->driver_info) && H5FD_MPIO_COLLECTIVE==dx->xfer_mode) { - HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, - "collective access not permissible"); + if (H5FD_MPIO!=dataset->ent.file->shared->lf->driver_id) + HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, + "collective access for MPIO driver only"); } } #endif |