Commit aecce446 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

corrected some openMP-errors

parent cd4895db
...@@ -811,7 +811,7 @@ namespace AMDiS { ...@@ -811,7 +811,7 @@ namespace AMDiS {
#else #else
#ifdef _OPENMP #ifdef _OPENMP
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n",
omp_get_wtime() - wtime); omp_get_wtime() - first);
#else #else
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n",
TIME_USED(first, clock())); TIME_USED(first, clock()));
......
...@@ -438,7 +438,7 @@ namespace AMDiS { ...@@ -438,7 +438,7 @@ namespace AMDiS {
TEST_EXIT_DBG(size == matrix.getNumCols())("incompatible sizes\n"); TEST_EXIT_DBG(size == matrix.getNumCols())("incompatible sizes\n");
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for schedule(static, 1) num_threads(min(size, omp_get_max_threads())) #pragma omp parallel for schedule(static, 1) num_threads(std::min(size, omp_get_max_threads()))
#endif #endif
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (!add) if (!add)
...@@ -464,7 +464,7 @@ namespace AMDiS { ...@@ -464,7 +464,7 @@ namespace AMDiS {
int i; int i;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for schedule(static, 1) num_threads(min(size, omp_get_max_threads())) #pragma omp parallel for schedule(static, 1) num_threads(std::min(size, omp_get_max_threads()))
#endif #endif
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
axpy(a, *(x.getDOFVector(i)), *(y.getDOFVector(i))); axpy(a, *(x.getDOFVector(i)), *(y.getDOFVector(i)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment