From 9063dd2373225196b85f61833b8caa4b1ef40c56 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Sat, 5 May 2012 07:52:56 -0400
Subject: CarpetLib: Disable OpenMP collapse statements

These do not work on all systems, and we don't autoconf them yet.
---
 Carpet/CarpetLib/src/copy_3d.cc                | 2 +-
 Carpet/CarpetLib/src/copy_4d.cc                | 2 +-
 Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc | 8 ++++----
 Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc     | 2 +-
 Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc   | 2 +-
 Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc     | 2 +-
 Carpet/CarpetLib/src/restrict_4d_rf2.cc        | 2 +-
 CarpetDev/CarpetIOF5/src/distribute.cc         | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Carpet/CarpetLib/src/copy_3d.cc b/Carpet/CarpetLib/src/copy_3d.cc
index 5e2eba236..11eedc0c2 100644
--- a/Carpet/CarpetLib/src/copy_3d.cc
+++ b/Carpet/CarpetLib/src/copy_3d.cc
@@ -133,7 +133,7 @@ namespace CarpetLib {
     
     
     // Loop over region
-#pragma omp parallel for collapse(3)
+#pragma omp parallel for //collapse(3)
     for (int k=0; k<regkext; ++k) {
       for (int j=0; j<regjext; ++j) {
         for (int i=0; i<regiext; ++i) {
diff --git a/Carpet/CarpetLib/src/copy_4d.cc b/Carpet/CarpetLib/src/copy_4d.cc
index b0012e196..7aed29aaf 100644
--- a/Carpet/CarpetLib/src/copy_4d.cc
+++ b/Carpet/CarpetLib/src/copy_4d.cc
@@ -112,7 +112,7 @@ namespace CarpetLib {
     
     
     // Loop over region
-#pragma omp parallel for collapse(4)
+#pragma omp parallel for //collapse(4)
     for (int l=0; l<reglext; ++l) {
       for (int k=0; k<regkext; ++k) {
         for (int j=0; j<regjext; ++j) {
diff --git a/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc
index 3bcd3f10c..6d8ead898 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc
@@ -140,7 +140,7 @@ namespace CarpetLib {
       // Loop over fine region
 #ifdef HRSCC_HH
       ptrdiff_t const i=0;
-#pragma omp parallel for collapse(2)
+#pragma omp parallel for //collapse(2)
       for (ptrdiff_t k=0; k<regkext; k+=2*(ORDER+1)) {
         for (ptrdiff_t j=0; j<regjext; j+=2*(ORDER+1)) {
           GLLElement<ORDER>::prolongate_2D
@@ -179,7 +179,7 @@ namespace CarpetLib {
       // Loop over fine region
 #ifdef HRSCC_HH
       ptrdiff_t const j=0;
-#pragma omp parallel for collapse(2)
+#pragma omp parallel for //collapse(2)
       for (ptrdiff_t k=0; k<regkext; k+=2*(ORDER+1)) {
         for (ptrdiff_t i=0; i<regiext; i+=2*(ORDER+1)) {
           GLLElement<ORDER>::prolongate_2D
@@ -218,7 +218,7 @@ namespace CarpetLib {
       // Loop over fine region
 #ifdef HRSCC_HH
       ptrdiff_t const k=0;
-#pragma omp parallel for collapse(2)
+#pragma omp parallel for //collapse(2)
       for (ptrdiff_t j=0; j<regjext; j+=2*(ORDER+1)) {
         for (ptrdiff_t i=0; i<regiext; i+=2*(ORDER+1)) {
           GLLElement<ORDER>::prolongate_2D
@@ -254,7 +254,7 @@ namespace CarpetLib {
       
       // Loop over fine region
 #ifdef HRSCC_HH
-#pragma omp parallel for collapse(3)
+#pragma omp parallel for //collapse(3)
       for (ptrdiff_t k=0; k<regkext; k+=2*(ORDER+1)) {
         for (ptrdiff_t j=0; j<regjext; j+=2*(ORDER+1)) {
           for (ptrdiff_t i=0; i<regiext; i+=2*(ORDER+1)) {
diff --git a/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
index f200f59fe..dd419cb92 100644
--- a/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
@@ -122,7 +122,7 @@ namespace CarpetLib {
     
     
     // Loop over coarse region
-#pragma omp parallel for collapse(3)
+#pragma omp parallel for //collapse(3)
     for (int k=0; k<regkext; ++k) {
       for (int j=0; j<regjext; ++j) {
         for (int i=0; i<regiext; ++i) {
diff --git a/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc
index 45bf10b21..d232c7e81 100644
--- a/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc
@@ -124,7 +124,7 @@ namespace CarpetLib {
     
     // Loop over coarse region
 #ifdef HRSCC_HH
-#pragma omp parallel for collapse(3)
+#pragma omp parallel for //collapse(3)
     for (ptrdiff_t k=0; k<regkext; k+=ORDER+1) {
       for (ptrdiff_t j=0; j<regjext; j+=ORDER+1) {
         for (ptrdiff_t i=0; i<regiext; i+=ORDER+1) {
diff --git a/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc
index d61db7036..2c9a349b5 100644
--- a/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc
@@ -232,7 +232,7 @@ namespace CarpetLib {
     
     
     // Loop over coarse region
-#pragma omp parallel for collapse(3)
+#pragma omp parallel for //collapse(3)
     for (int k=0; k<regkext; ++k) {
       for (int j=0; j<regjext; ++j) {
         for (int i=0; i<regiext; ++i) {
diff --git a/Carpet/CarpetLib/src/restrict_4d_rf2.cc b/Carpet/CarpetLib/src/restrict_4d_rf2.cc
index 1a89171d7..01b66ee78 100644
--- a/Carpet/CarpetLib/src/restrict_4d_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_4d_rf2.cc
@@ -111,7 +111,7 @@ namespace CarpetLib {
     
     
     // Loop over coarse region
-#pragma omp parallel for collapse(4)
+#pragma omp parallel for //collapse(4)
     for (int l=0; l<reglext; ++l) {
       for (int k=0; k<regkext; ++k) {
         for (int j=0; j<regjext; ++j) {
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;
-- 
cgit v1.2.3