From 48115ee2f00843dc25c11dbd88fb7fa7841a51a2 Mon Sep 17 00:00:00 2001 From: Caner Candan Date: Thu, 27 Jan 2011 10:31:28 +0100 Subject: [PATCH] * changed apply.h to use new parallelization s parameters Conflicts: eo/src/apply.h --- eo/src/apply.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eo/src/apply.h b/eo/src/apply.h index 9e112cdc..bba8adc8 100644 --- a/eo/src/apply.h +++ b/eo/src/apply.h @@ -40,9 +40,10 @@ template void apply(eoUF& _proc, std::vector& _pop) { - double t1 = omp_get_wtime(); size_t size = _pop.size(); + double t1 = omp_get_wtime(); + if (!eo::parallel.isDynamic()) { #pragma omp parallel for if(eo::parallel.isEnabled()) //default(none) shared(_proc, _pop, size)