Skip to content
Snippets Groups Projects
Commit 2eabc5d4 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'master' into 'multi-all'

# Conflicts:
#   mpiuse.c
#   swiftmpifakestepsim.c
parents bb3e74cd 0f210f8c
No related branches found
No related tags found
1 merge request!9Draft: Multiple threads for inject, send and recv.
...@@ -446,7 +446,7 @@ static void usage(char *argv[]) { ...@@ -446,7 +446,7 @@ static void usage(char *argv[]) {
"\t-r -o <file> use occurence sample of values in a file, size is a " "\t-r -o <file> use occurence sample of values in a file, size is a "
"scale factor.,] \n" "scale factor.,] \n"
"\t-x random seed\n" "\t-x random seed\n"
"\t-z output log in standard format, i.e. can be used as input"); "\t-z outout log in standard format, i.e. can be used as input");
fflush(stderr); fflush(stderr);
} }
......
...@@ -56,7 +56,7 @@ static const int task_type_send = 25; ...@@ -56,7 +56,7 @@ static const int task_type_send = 25;
static const int task_type_recv = 26; static const int task_type_recv = 26;
/* Global communicators for each of the subtypes. */ /* Global communicators for each of the subtypes. */
static const int task_subtype_count = 34; // Just some upper limit on subtype. #define task_subtype_count 34 // Just some upper limit on subtype.
static MPI_Comm subtypeMPI_comms[task_subtype_count]; static MPI_Comm subtypeMPI_comms[task_subtype_count];
/* The local queues. */ /* The local queues. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment