CarpetLib: Re-enable OpenMP collapse clauses

10 files changed, 31 insertions, 31 deletions

diff --git a/Carpet/CarpetLib/src/copy_3d.cc b/Carpet/CarpetLib/src/copy_3d.cc
index 7cb4ddb80..f7c860ef2 100644
--- a/Carpet/CarpetLib/src/copy_3d.cc
+++ b/Carpet/CarpetLib/src/copy_3d.cc
@@ -135,7 +135,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 b0cc024f4..c4869b548 100644
--- a/Carpet/CarpetLib/src/copy_4d.cc
+++ b/Carpet/CarpetLib/src/copy_4d.cc
@@ -119,7 +119,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 3be587551..72bb817e6 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc
@@ -162,10 +162,10 @@ namespace CarpetLib {
       // Loop over fine region
 #ifdef HRSCC_HH
       ptrdiff_t const i=0;
-#pragma omp parallel for //collapse(2)
-      // Zwicky's Intel compiler ices on ptrdiff_t
-      for (int k=0; k<regkext; k+=2*(ORDER+1)) {
-        for (int j=0; j<regjext; j+=2*(ORDER+1)) {
+#pragma omp parallel for collapse(2)
+      // Zwicky's Intel compiler 11.1 ices on ptrdiff_t
+      for (/*ptrdiff_t*/int k=0; k<regkext; k+=2*(ORDER+1)) {
+        for (/*ptrdiff_t*/int j=0; j<regjext; j+=2*(ORDER+1)) {
           GLLElement<ORDER>::prolongate_2D
             (&src[SRCIND3(srcioff+i, srcjoff+j, srckoff+k)], srcstr2d,
              &dst[DSTIND3(dstioff+2*i, dstjoff+2*j, dstkoff+2*k)], dststr2d);
@@ -202,10 +202,10 @@ namespace CarpetLib {
       // Loop over fine region
 #ifdef HRSCC_HH
       ptrdiff_t const j=0;
-#pragma omp parallel for //collapse(2)
-      // Zwicky's Intel compiler ices on ptrdiff_t
-      for (int k=0; k<regkext; k+=2*(ORDER+1)) {
-        for (int i=0; i<regiext; i+=2*(ORDER+1)) {
+#pragma omp parallel for collapse(2)
+      // Zwicky's Intel compiler 11.1 ices on ptrdiff_t
+      for (/*ptrdiff_t*/int k=0; k<regkext; k+=2*(ORDER+1)) {
+        for (/*ptrdiff_t*/int i=0; i<regiext; i+=2*(ORDER+1)) {
           GLLElement<ORDER>::prolongate_2D
             (&src[SRCIND3(srcioff+i, srcjoff+j, srckoff+k)], srcstr2d,
              &dst[DSTIND3(dstioff+2*i, dstjoff+2*j, dstkoff+2*k)], dststr2d);
@@ -242,10 +242,10 @@ namespace CarpetLib {
       // Loop over fine region
 #ifdef HRSCC_HH
       ptrdiff_t const k=0;
-#pragma omp parallel for //collapse(2)
-      // Zwicky's Intel compiler ices on ptrdiff_t
-      for (int j=0; j<regjext; j+=2*(ORDER+1)) {
-        for (int i=0; i<regiext; i+=2*(ORDER+1)) {
+#pragma omp parallel for collapse(2)
+      // Zwicky's Intel compiler 11.1 ices on ptrdiff_t
+      for (/*ptrdiff_t*/int j=0; j<regjext; j+=2*(ORDER+1)) {
+        for (/*ptrdiff_t*/int i=0; i<regiext; i+=2*(ORDER+1)) {
           GLLElement<ORDER>::prolongate_2D
             (&src[SRCIND3(srcioff+i, srcjoff+j, srckoff+k)], srcstr2d,
              &dst[DSTIND3(dstioff+2*i, dstjoff+2*j, dstkoff+2*k)], dststr2d);
@@ -279,11 +279,11 @@ namespace CarpetLib {
       
       // Loop over fine region
 #ifdef HRSCC_HH
-#pragma omp parallel for //collapse(3)
-      // Zwicky's Intel compiler ices on ptrdiff_t
-      for (int k=0; k<regkext; k+=2*(ORDER+1)) {
-        for (int j=0; j<regjext; j+=2*(ORDER+1)) {
-          for (int i=0; i<regiext; i+=2*(ORDER+1)) {
+#pragma omp parallel for collapse(3)
+      // Zwicky's Intel compiler 11.1 ices on ptrdiff_t
+      for (/*ptrdiff_t*/int k=0; k<regkext; k+=2*(ORDER+1)) {
+        for (/*ptrdiff_t*/int j=0; j<regjext; j+=2*(ORDER+1)) {
+          for (/*ptrdiff_t*/int i=0; i<regiext; i+=2*(ORDER+1)) {
             GLLElement<ORDER>::prolongate_full
               (&src[SRCIND3(srcioff+i, srcjoff+j, srckoff+k)], srcstr,
                &dst[DSTIND3(dstioff+2*i, dstjoff+2*j, dstkoff+2*k)], dststr);
diff --git a/Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc
index 981398ae3..12404ea25 100644
--- a/Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc
@@ -138,7 +138,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_cc_o5_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_cc_o5_rf2.cc
index 6c90daa44..2cd1b1f1f 100644
--- a/Carpet/CarpetLib/src/restrict_3d_cc_o5_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_cc_o5_rf2.cc
@@ -205,7 +205,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_cc_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
index 13b59a7f8..ee3fafc18 100644
--- a/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
@@ -127,7 +127,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 e438d360b..4c55be631 100644
--- a/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc
@@ -146,11 +146,11 @@ namespace CarpetLib {
     
     // Loop over coarse region
 #ifdef HRSCC_HH
-#pragma omp parallel for //collapse(3)
-    // Zwicky's Intel compiler ices on ptrdiff_t
-    for (int k=0; k<regkext; k+=ORDER+1) {
-      for (int j=0; j<regjext; j+=ORDER+1) {
-        for (int i=0; i<regiext; i+=ORDER+1) {
+#pragma omp parallel for collapse(3)
+    // Zwicky's Intel compiler 11.1 ices on ptrdiff_t
+    for (/*ptrdiff_t*/int k=0; k<regkext; k+=ORDER+1) {
+      for (/*ptrdiff_t*/int j=0; j<regjext; j+=ORDER+1) {
+        for (/*ptrdiff_t*/int i=0; i<regiext; i+=ORDER+1) {
           GLLElement<ORDER>::restrict_full
             (&src[SRCIND3(srcioff+2*i, srcjoff+2*j, srckoff+2*k)], srcstr,
              &dst[DSTIND3(dstioff+i, dstjoff+j, dstkoff+k)], dststr);
diff --git a/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc
index 44799a60f..e1539aa06 100644
--- a/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc
@@ -250,7 +250,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 bd5d7079c..a41700f1f 100644
--- a/Carpet/CarpetLib/src/restrict_4d_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_4d_rf2.cc
@@ -118,7 +118,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 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;