comment out omp pragmas (they do not seem to help)
Merge branch 'openmp_review'