aboutsummaryrefslogtreecommitdiff
path: root/CarpetDev
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2012-05-05 07:52:56 -0400
committerBarry Wardell <barry.wardell@gmail.com>2012-09-11 18:23:19 +0100
commit9063dd2373225196b85f61833b8caa4b1ef40c56 (patch)
treef1cb83239cf3f74ca7f5fc5962d3b1780eea4a3a /CarpetDev
parent81625743e4ff136795f98b76d95ddd526469f886 (diff)
CarpetLib: Disable OpenMP collapse statements
These do not work on all systems, and we don't autoconf them yet.
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 66ad0715f..05658ee42 100644
--- a/CarpetDev/CarpetIOF5/src/distribute.cc
+++ b/CarpetDev/CarpetIOF5/src/distribute.cc
@@ -537,7 +537,7 @@ namespace CarpetIOF5 {
ptrdiff_t const ind0s = i0s * dis + j0s * djs + k0s * dks;
char const *const src = &((char const*)data)[vartypesize * 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;
@@ -614,7 +614,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;