common/ompio: adjust location of fcoll_base_file_select

adjust the location on where the fcoll_base_file_select function is
colled to ensure that all fs level parameters are correctly set.

io/ompio: minor fixes to initialization of the stripe_size and an if statement in the
simple_grouping option.

Signed-off-by: Edgar Gabriel <gabriel@cs.uh.edu>

ompi/mca/common/ompio/common_ompio_file_open.c

@@ -129,11 +129,6 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
         goto fn_fail;
     }
 
-    if (OMPI_SUCCESS != (ret = mca_fcoll_base_file_select (ompio_fh,
-                                                           NULL))) {
-        opal_output(1, "mca_fcoll_base_file_select() failed\n");
-        goto fn_fail;
-    }
 
     ompio_fh->f_sharedfp_component = NULL; /*component*/
     ompio_fh->f_sharedfp           = NULL; /*module*/
@@ -165,6 +160,12 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
         goto fn_fail;
     }
 
+    if (OMPI_SUCCESS != (ret = mca_fcoll_base_file_select (ompio_fh,
+                                                           NULL))) {
+        opal_output(1, "mca_fcoll_base_file_select() failed\n");
+        goto fn_fail;
+    }
+
 
     if ( true == use_sharedfp ) {
 	/* open the file once more for the shared file pointer if required.           
@@ -420,7 +421,7 @@ int mca_common_ompio_set_file_defaults (mca_io_ompio_file_t *fh)
 
         /* Default file View */
         fh->f_iov_type = MPI_DATATYPE_NULL;
-        fh->f_stripe_size = mca_io_ompio_bytes_per_agg;
+        fh->f_stripe_size = 0;
 	/*Decoded iovec of the file-view*/
 	fh->f_decoded_iov = NULL;
         fh->f_etype = NULL;

ompi/mca/io/ompio/io_ompio_aggregators.c

@@ -63,7 +63,7 @@ int mca_io_ompio_simple_grouping(mca_io_ompio_file_t *fh,
     int k=0, p=0, g=0;
     int total_procs = 0; 
 
-    if ( 0 < fh->f_stripe_size ) {
+    if ( 0 >= fh->f_stripe_size ) {
         stripe_size = OMPIO_DEFAULT_STRIPE_SIZE;
     }