SomeNet
/
public repos
/
pub
/
astra
/
parallel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39c70b2
)
remove useless code
author
David Kaufmann
<astra@ionic.at>
Mon, 23 Jan 2012 10:46:36 +0000
(11:46 +0100)
committer
David Kaufmann
<astra@ionic.at>
Mon, 23 Jan 2012 10:46:36 +0000
(11:46 +0100)
openmp/merge/sort.c
patch
|
blob
|
history
diff --git
a/openmp/merge/sort.c
b/openmp/merge/sort.c
index bee8bc661889751d7f727e8dfc1f6eee9f11ed9f..6107179645522b9f6c342caa2365c79f7ac4642c 100644
(file)
--- a/
openmp/merge/sort.c
+++ b/
openmp/merge/sort.c
@@
-21,7
+21,7
@@
void merge(int ti, numtype * a, int n, numtype * b, int m, numtype * c);
int main ( int argc, char ** argv) {
int n = LISTSIZE, m = LISTSIZE;
- int p =
min(omp_get_num_procs(), n)
;
+ int p =
1
;
int opt, i;
int a_len, b_len, b_len_end, b_len_begin;
numtype * c;