diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-11-17 20:36:27 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-11-22 09:59:16 -0500 |
| commit | bf5e78ebd64631f6f92d2c239c5ae234cac8b49a (patch) | |
| tree | 6407d075051ba448093dd65829fe91aa9891e30d /Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc | |
| parent | 53a1c146bc09c67ea709c14dab4c73ebebed86dc (diff) | |
CarpetLib: Re-enable OpenMP collapse clauses
Diffstat (limited to 'Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc')
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc | 34 |
1 files changed, 17 insertions, 17 deletions
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); |