diff options
Diffstat (limited to 'Carpet/CarpetLib')
-rw-r--r-- | Carpet/CarpetLib/src/copy_3d.cc | 2 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/copy_4d.cc | 2 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc | 34 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc | 2 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/restrict_3d_cc_o5_rf2.cc | 2 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc | 2 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc | 10 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc | 2 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/restrict_4d_rf2.cc | 2 |
9 files changed, 29 insertions, 29 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) { |