From a51e43c49f5381c07f1713649bc6067a5f734db8 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Thu, 24 Nov 2011 01:31:19 +0100 Subject: [PATCH] add m --- openmp/merge/sort.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmp/merge/sort.c b/openmp/merge/sort.c index e18d1c8..03ed112 100644 --- a/openmp/merge/sort.c +++ b/openmp/merge/sort.c @@ -13,7 +13,7 @@ int rank(int elem, int * list); void merge(int ti, ATYPE * a, int n, ATYPE * b, int m, ATYPE * c); int main ( int argc, char ** argv) { - int n = LISTSIZE; + int n = LISTSIZE, m = LISTSIZE; int p = 1; int opt, i; int a_len, b_len, b_len_end, b_len_begin; @@ -43,7 +43,7 @@ int main ( int argc, char ** argv) { startTime = omp_get_wtime(); a_len = n/p; - #pragma omp parallel for shared(a,b,c,n,p,a_len) private(i,b_len_begin,b_len_end,b_len) + #pragma omp parallel for shared(a,b,c,n,m,p,a_len) private(i,b_len_begin,b_len_end,b_len) for (i = 0; i < p; i++) { b_len_begin = rank(a[i*a_len], b); b_len_end = rank(a[(i+1)*a_len], b); @@ -82,7 +82,7 @@ void printlist(char * message, ATYPE * ptr) { printf ("\n"); } -int rank(int elem, ATYPE * list) { +int rank(ATYPE elem, ATYPE * list) { int pos; pos = 0; -- 2.43.0