Fix number of aggregators used in two phase fcoll

ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c

@@ -190,8 +190,7 @@ mca_fcoll_two_phase_file_read_all (mca_io_ompio_file_t *fh,
 	    return ret;
 	}
 	
-	two_phase_num_io_procs = 
-	    ceil((float)fh->f_size/fh->f_procs_per_group);
+	two_phase_num_io_procs = fh->f_final_num_aggrs;
 	
     }
     

ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c

@@ -222,8 +222,7 @@ mca_fcoll_two_phase_file_write_all (mca_io_ompio_file_t *fh,
 	    return  ret;
 	}
 	
-	two_phase_num_io_procs = 
-	    ceil((float)fh->f_size/fh->f_procs_per_group);
+	two_phase_num_io_procs = fh->f_final_num_aggrs; 
 	
     }
     

ompi/mca/io/ompio/io_ompio.c

@@ -2150,6 +2150,9 @@ int mca_io_ompio_create_groups(mca_io_ompio_file_t *fh,
 			               fh->f_comm,
 			               fh->f_comm->c_coll.coll_allreduce_module);
     
+    //Set final number of aggregators in file handle
+    fh->f_final_num_aggrs = final_num_aggrs;
+
     //Print final number of aggregators if required
 
     /*if(fh->f_rank == 0){

ompi/mca/io/ompio/io_ompio.h

@@ -349,6 +349,7 @@ struct mca_io_ompio_file_t {
     int f_init_procs_per_group;
     int *f_init_procs_in_group;
 
+    int f_final_num_aggrs;
 
     mca_io_ompio_decode_datatype_fn_t                       f_decode_datatype;
     mca_io_ompio_generate_current_file_view_fn_t f_generate_current_file_view;