From aecce446e1926b578565b8f8c941ec2c80cfc29b Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sat, 19 Mar 2011 12:15:51 +0000
Subject: [PATCH] corrected some openMP-errors
---
AMDiS/src/ProblemVec.cc | 2 +-
AMDiS/src/SystemVector.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index 9bbf6665..55301c56 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 ccf557ae..142ba3d9 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)));
--
GitLab