Merge branch 'master' into fakedata

swiftmpistepsim.c

@@ -42,12 +42,12 @@ static int usetics = 1;
 static int datacheck = 0;
 
 /* Integer types of send and recv tasks, must match log. */
-static const int task_type_send = 22;
-static const int task_type_recv = 23;
+static const int task_type_send = 25;
+static const int task_type_recv = 26;
 
 /* Global communicators for each of the subtypes. */
-static const int task_subtype_count = 30;  // Just some upper limit on subtype.
-static MPI_Comm subtypeMPI_comms[30];
+static const int task_subtype_count = 34;  // Just some upper limit on subtype.
+static MPI_Comm subtypeMPI_comms[task_subtype_count];
 
 /* The local queues. */
 static struct mpiuse_log_entry **volatile reqs_queue;