Fix omp performance issue using a manual condition
Merge pull request #260 from pbrunet/enable_omp

Fix omp performance issue using a manual condition