OpenMP changes:

Use #pragma instead of _Pragma for OpenMP directives.  The PGI compilers do
not understand the _Pragma syntax.

Use int instead of ptrdiff_t for loop variables which are parallelised via
OpenMP.  The PGI compilers cannot handle ptrdiff_t.

8 files changed, 25 insertions, 25 deletions

diff --git a/Carpet/CarpetLib/src/copy_3d.cc b/Carpet/CarpetLib/src/copy_3d.cc
index 5c9950f50..36a48df40 100644
--- a/Carpet/CarpetLib/src/copy_3d.cc
+++ b/Carpet/CarpetLib/src/copy_3d.cc
@@ -103,9 +103,9 @@ namespace CarpetLib {
     
     // Loop over region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           dst [DSTIND3(i, j, k)] = src [SRCIND3(i, j, k)];
           
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index bad80a00a..da1f8ab56 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -58,7 +58,8 @@ call_operator (void
 #  if ! defined (CARPET_OPTIMISE)
   ibset allregbboxes;
 #  endif
-  _Pragma ("omp parallel") {
+#pragma omp parallel
+  {
     int const num_threads = omp_get_num_threads();
     int const thread_num = omp_get_thread_num();
     // Parallelise in z direction
@@ -83,9 +84,8 @@ call_operator (void
     if (not myregbbox.empty()) {
       (* the_operator) (src, srcext, dst, dstext, srcbbox, dstbbox, myregbbox);
 #  if ! defined (NDEBUG) && ! defined (CARPET_OPTIMISE)
-      _Pragma ("omp critical") {
-        allregbboxes += myregbbox;
-      }
+#pragma omp critical
+      allregbboxes += myregbbox;
 #  endif
     }
   }
diff --git a/Carpet/CarpetLib/src/interpolate_3d_2tl.cc b/Carpet/CarpetLib/src/interpolate_3d_2tl.cc
index 78170b1ee..0b984b142 100644
--- a/Carpet/CarpetLib/src/interpolate_3d_2tl.cc
+++ b/Carpet/CarpetLib/src/interpolate_3d_2tl.cc
@@ -121,9 +121,9 @@ namespace CarpetLib {
     
     // Loop over region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           dst [DSTIND3(i, j, k)] =
             + s1fac * src1 [SRCIND3(i, j, k)]
diff --git a/Carpet/CarpetLib/src/interpolate_3d_3tl.cc b/Carpet/CarpetLib/src/interpolate_3d_3tl.cc
index 9a1d0e5d7..c0e8b44fd 100644
--- a/Carpet/CarpetLib/src/interpolate_3d_3tl.cc
+++ b/Carpet/CarpetLib/src/interpolate_3d_3tl.cc
@@ -125,9 +125,9 @@ namespace CarpetLib {
     
     // Loop over region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           dst [DSTIND3(i, j, k)] =
             + s1fac * src1 [SRCIND3(i, j, k)]
diff --git a/Carpet/CarpetLib/src/interpolate_3d_4tl.cc b/Carpet/CarpetLib/src/interpolate_3d_4tl.cc
index 9892d0bbf..7d4c7fe26 100644
--- a/Carpet/CarpetLib/src/interpolate_3d_4tl.cc
+++ b/Carpet/CarpetLib/src/interpolate_3d_4tl.cc
@@ -132,9 +132,9 @@ namespace CarpetLib {
     
     // Loop over region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           dst [DSTIND3(i, j, k)] =
             + s1fac * src1 [SRCIND3(i, j, k)]
diff --git a/Carpet/CarpetLib/src/interpolate_3d_5tl.cc b/Carpet/CarpetLib/src/interpolate_3d_5tl.cc
index abad807b1..f4204ea68 100644
--- a/Carpet/CarpetLib/src/interpolate_3d_5tl.cc
+++ b/Carpet/CarpetLib/src/interpolate_3d_5tl.cc
@@ -137,9 +137,9 @@ namespace CarpetLib {
     
     // Loop over region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           dst [DSTIND3(i, j, k)] =
             + s1fac * src1 [SRCIND3(i, j, k)]
diff --git a/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc b/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc
index ef3a69053..e84059d10 100644
--- a/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc
+++ b/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc
@@ -155,9 +155,9 @@ namespace CarpetLib {
     
     // Loop over region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           T const s1 = src1 [SRCIND3(i, j, k)];
           T const s2 = src2 [SRCIND3(i, j, k)];
diff --git a/Carpet/CarpetLib/src/restrict_3d_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_rf2.cc
index e64c4f6e5..26031f304 100644
--- a/Carpet/CarpetLib/src/restrict_3d_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_rf2.cc
@@ -102,9 +102,9 @@ namespace CarpetLib {
     
     // Loop over coarse region
 #pragma omp parallel for
-    for (ptrdiff_t k=0; k<regkext; ++k) {
-      for (ptrdiff_t j=0; j<regjext; ++j) {
-        for (ptrdiff_t i=0; i<regiext; ++i) {
+    for (int k=0; k<regkext; ++k) {
+      for (int j=0; j<regjext; ++j) {
+        for (int i=0; i<regiext; ++i) {
           
           dst [DSTIND3(i, j, k)] = src [SRCIND3(2*i, 2*j, 2*k)];