further debugging

ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c

@@ -670,7 +670,6 @@ static int subroutine ( int index, int cycles, int aggregator, int rank, mca_io_
                 data->bytes_to_write_in_cycle -= data->bytes_remaining;
                 data->bytes_remaining = 0;
 //                continue;
-//                break;
             }
             else {
                 /* the remaining data from the previous cycle is larger than the
@@ -803,11 +802,7 @@ static int subroutine ( int index, int cycles, int aggregator, int rank, mca_io_
                     }
                 }
             }
-        }
+                
-      else{
-//            continue;
-          return OMPI_SUCCESS;
-      }
             /* Sort the displacements for each aggregator*/
             local_heap_sort (file_offsets_for_agg,
                              entries_per_aggregator,
@@ -917,9 +912,9 @@ static int subroutine ( int index, int cycles, int aggregator, int rank, mca_io_
                     }
                 }
             }
+        }  /* end if (entries_per_aggr > 0 ) */
     }/* end if (aggregator == rank ) */
     
-    
     if ( data->sendbuf_is_contiguous ) {
         send_buf = &((char*)data->buf)[data->total_bytes_written];
     }
@@ -991,7 +986,7 @@ static int subroutine ( int index, int cycles, int aggregator, int rank, mca_io_
         }
     }
     
-    if (aggregator == rank) {
+    if (aggregator == rank && entries_per_aggregator > 0 ) {
         ret = ompi_request_wait_all (data->procs_per_group,
                                      data->recv_req,
                                      MPI_STATUS_IGNORE);
@@ -1025,7 +1020,7 @@ static int subroutine ( int index, int cycles, int aggregator, int rank, mca_io_
      *** 7f. Create the io array, and pass it to fbtl
      *********************************************************/
     
-    if (aggregator == rank) {
+    if (aggregator == rank && entries_per_aggregator>0) {
         
 #if OMPIO_FCOLL_WANT_TIME_BREAKDOWN
         start_write_time = MPI_Wtime();