aboutsummaryrefslogtreecommitdiff
path: root/CarpetDev
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2012-11-17 20:36:27 -0500
committerErik Schnetter <schnetter@gmail.com>2012-11-22 09:59:16 -0500
commitbf5e78ebd64631f6f92d2c239c5ae234cac8b49a (patch)
tree6407d075051ba448093dd65829fe91aa9891e30d /CarpetDev
parent53a1c146bc09c67ea709c14dab4c73ebebed86dc (diff)
CarpetLib: Re-enable OpenMP collapse clauses
Diffstat (limited to 'CarpetDev')
-rw-r--r--CarpetDev/CarpetIOF5/src/distribute.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/CarpetDev/CarpetIOF5/src/distribute.cc b/CarpetDev/CarpetIOF5/src/distribute.cc
index ae3139280..5fd8e5a29 100644
--- a/CarpetDev/CarpetIOF5/src/distribute.cc
+++ b/CarpetDev/CarpetIOF5/src/distribute.cc
@@ -534,7 +534,7 @@ namespace CarpetIOF5 {
assert(ind0s < nps);
char const *const src = &((char const*)data)[ind0s];
-#pragma omp parallel for //collapse(2)
+#pragma omp parallel for collapse(2)
for (ptrdiff_t k=0; k<nk; ++k) {
for (ptrdiff_t j=0; j<nj; ++j) {
ptrdiff_t const ind = j*dj + k*dk;
@@ -612,7 +612,7 @@ namespace CarpetIOF5 {
assert(data.has_storage());
char *const dst = &((char*)data.storage())[ind0d];
-#pragma omp parallel for //collapse(2)
+#pragma omp parallel for collapse(2)
for (ptrdiff_t k=0; k<nk; ++k) {
for (ptrdiff_t j=0; j<nj; ++j) {
ptrdiff_t const indd = j*djd + k*dkd;