diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-12-11 14:15:48 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-12-11 14:15:48 -0500 |
| commit | 8d948b752cf61bbbf46e254a9fea6721a99771d6 (patch) | |
| tree | b4f6eddd63659a38548d0f5f59af206659cd6ad2 /Carpet/CarpetLib | |
| parent | 532e87358ffc615711bb1a16fe2e75743594db78 (diff) | |
CarpetLib: Check HRSCC_GLL_ELEMENT_HH instead of HRSCC_HH
Check HRSCC_GLL_ELEMENT_HH instead of HRSCC_HH to see whether DGFE is supported.
Diffstat (limited to 'Carpet/CarpetLib')
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc | 10 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc index 72bb817e6..18d5fcf49 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc @@ -12,7 +12,7 @@ #include "typeprops.hh" using namespace std; -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH using namespace hrscc; #endif @@ -160,7 +160,7 @@ namespace CarpetLib { int const dststr2d[2] = {dstdj, dstdk}; // Loop over fine region -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH ptrdiff_t const i=0; #pragma omp parallel for collapse(2) // Zwicky's Intel compiler 11.1 ices on ptrdiff_t @@ -200,7 +200,7 @@ namespace CarpetLib { int const dststr2d[2]= {dstdi, dstdk}; // Loop over fine region -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH ptrdiff_t const j=0; #pragma omp parallel for collapse(2) // Zwicky's Intel compiler 11.1 ices on ptrdiff_t @@ -240,7 +240,7 @@ namespace CarpetLib { int const dststr2d[2]= {dstdi, dstdj}; // Loop over fine region -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH ptrdiff_t const k=0; #pragma omp parallel for collapse(2) // Zwicky's Intel compiler 11.1 ices on ptrdiff_t @@ -278,7 +278,7 @@ namespace CarpetLib { int const dststr[3] = {dstdi, dstdj, dstdk}; // Loop over fine region -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH #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)) { diff --git a/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc index 4c55be631..c13b863e8 100644 --- a/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc +++ b/Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc @@ -12,7 +12,7 @@ #include "typeprops.hh" using namespace std; -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH using namespace hrscc; #endif @@ -145,7 +145,7 @@ namespace CarpetLib { assert(all(regext % (ORDER+1) == 0)); // Loop over coarse region -#ifdef HRSCC_HH +#ifdef HRSCC_GLL_ELEMENT_HH #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) { |