From bf5e78ebd64631f6f92d2c239c5ae234cac8b49a Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Sat, 17 Nov 2012 20:36:27 -0500
Subject: CarpetLib: Re-enable OpenMP collapse clauses

---
 CarpetDev/CarpetIOF5/src/distribute.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CarpetDev')

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;
-- 
cgit v1.2.3