[svn-r404] Updated parallel code to reflect the changes in the H5F_t structure

in which access_parms is now a pointer to a struct (was a struct
before.)

2 files changed, 16 insertions, 16 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 77e2954..ea0eb38 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1172,7 +1172,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 	/* can always be simulated by independent access. */
 	/* Nevertheless, must check driver is MPIO before using those */
 	/* access_mode which exists only for MPIO case. */
-	if (dataset->ent.file->shared->access_parms.driver == H5F_LOW_MPIO){
+	if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO){
 	    /* 
 	     * -AKC-
 	     * "plant" the collective access mode into the file information
@@ -1188,8 +1188,8 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 	    printf("%s: collective access requested\n", FUNC);
 #endif
 	    access_mode_saved =
-		    dataset->ent.file->shared->access_parms.u.mpio.access_mode;
-	    dataset->ent.file->shared->access_parms.u.mpio.access_mode =
+		    dataset->ent.file->shared->access_parms->u.mpio.access_mode;
+	    dataset->ent.file->shared->access_parms->u.mpio.access_mode =
 		    H5D_XFER_COLLECTIVE;
 	}else{
 	    HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
@@ -1403,7 +1403,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * If so, need to restore the access mode.  Shouldnot needed.
      */
     if (xfer_parms->xfer_mode == H5D_XFER_COLLECTIVE){
-	dataset->ent.file->shared->access_parms.u.mpio.access_mode = access_mode_saved;
+	dataset->ent.file->shared->access_parms->u.mpio.access_mode = access_mode_saved;
     }
 #endif /*HAVE_PARALLEL*/
     FUNC_LEAVE(ret_value);
@@ -1476,7 +1476,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 	/* can always be simulated by independent access. */
 	/* Nevertheless, must check driver is MPIO before using those */
 	/* access_mode which exists only for MPIO case. */
-	if (dataset->ent.file->shared->access_parms.driver == H5F_LOW_MPIO){
+	if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO){
 	    /* 
 	     * -AKC-
 	     * "plant" the collective access mode into the file information
@@ -1492,8 +1492,8 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 	    printf("%s: collective access requested\n", FUNC);
 #endif
 	    access_mode_saved =
-		    dataset->ent.file->shared->access_parms.u.mpio.access_mode;
-	    dataset->ent.file->shared->access_parms.u.mpio.access_mode =
+		    dataset->ent.file->shared->access_parms->u.mpio.access_mode;
+	    dataset->ent.file->shared->access_parms->u.mpio.access_mode =
 		    H5D_XFER_COLLECTIVE;
 	}
 	else{
@@ -1714,7 +1714,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * If so, need to restore the access mode.  Shouldnot needed.
      */
     if (xfer_parms->xfer_mode == H5D_XFER_COLLECTIVE){
-	dataset->ent.file->shared->access_parms.u.mpio.access_mode = access_mode_saved;
+	dataset->ent.file->shared->access_parms->u.mpio.access_mode = access_mode_saved;
     }
 #endif /*HAVE_PARALLEL*/
     FUNC_LEAVE(ret_value);
diff --git a/src/H5Farray.c b/src/H5Farray.c
index 1f2bb6c..f882a9d 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -149,8 +149,8 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
     H5V_vector_cpy (layout->ndims, hslab_size, _hslab_size);
 
 #ifdef HAVE_PARALLEL
-    is_collective = (f->shared->access_parms.driver==H5F_LOW_MPIO
-	&& f->shared->access_parms.u.mpio.access_mode==H5D_XFER_COLLECTIVE);
+    is_collective = (f->shared->access_parms->driver==H5F_LOW_MPIO
+	&& f->shared->access_parms->u.mpio.access_mode==H5D_XFER_COLLECTIVE);
     if (is_collective){
 #ifdef AKC
     printf("%s: collective read requested\n", FUNC);
@@ -225,9 +225,9 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
 	    temp = nelmts;
 	    assert(temp==nelmts);	/* verify no overflow */
 	    MPI_Allreduce(&temp, &max, 1, MPI_UNSIGNED_LONG, MPI_MAX,
-		f->shared->access_parms.u.mpio.comm);
+		f->shared->access_parms->u.mpio.comm);
 	    MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN,
-		f->shared->access_parms.u.mpio.comm);
+		f->shared->access_parms->u.mpio.comm);
 #ifdef AKC
 printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
 #endif
@@ -359,8 +359,8 @@ H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout,
     H5V_vector_cpy (layout->ndims, hslab_size, _hslab_size);
 
 #ifdef HAVE_PARALLEL
-    is_collective = (f->shared->access_parms.driver==H5F_LOW_MPIO
-	&& f->shared->access_parms.u.mpio.access_mode==H5D_XFER_COLLECTIVE);
+    is_collective = (f->shared->access_parms->driver==H5F_LOW_MPIO
+	&& f->shared->access_parms->u.mpio.access_mode==H5D_XFER_COLLECTIVE);
     if (is_collective){
 #ifdef AKC
     printf("%s: collective write requested\n", FUNC);
@@ -435,9 +435,9 @@ H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout,
 	    temp = nelmts;
 	    assert(temp==nelmts);	/* verify no overflow */
 	    MPI_Allreduce(&temp, &max, 1, MPI_UNSIGNED_LONG, MPI_MAX,
-		f->shared->access_parms.u.mpio.comm);
+		f->shared->access_parms->u.mpio.comm);
 	    MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN,
-		f->shared->access_parms.u.mpio.comm);
+		f->shared->access_parms->u.mpio.comm);
 #ifdef AKC
 printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
 #endif