diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc index 9bbf6665bde53cb67ee78193598955b699eaaf42..55301c56159fc6cf43d93b0bf353802f8112c1c0 100644 --- a/AMDiS/src/ProblemVec.cc +++ b/AMDiS/src/ProblemVec.cc @@ -811,7 +811,7 @@ namespace AMDiS { #else #ifdef _OPENMP INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", - omp_get_wtime() - wtime); + omp_get_wtime() - first); #else INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", TIME_USED(first, clock())); diff --git a/AMDiS/src/SystemVector.h b/AMDiS/src/SystemVector.h index ccf557aec380386b770e0cbb32c267eb33d1476a..142ba3d99c8ddbc0458be86d761868987805806d 100644 --- a/AMDiS/src/SystemVector.h +++ b/AMDiS/src/SystemVector.h @@ -438,7 +438,7 @@ namespace AMDiS { TEST_EXIT_DBG(size == matrix.getNumCols())("incompatible sizes\n"); #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 for (i = 0; i < size; i++) { if (!add) @@ -464,7 +464,7 @@ namespace AMDiS { int i; #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 for (i = 0; i < size; i++) axpy(a, *(x.getDOFVector(i)), *(y.getDOFVector(i)));