diff options
Diffstat (limited to 'Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc')
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc index 8e2d6fc18..cd0d6038b 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc @@ -35,18 +35,17 @@ namespace CarpetLib { RT coeff (int const i) { - RT const one = 1; static const RT coeffs[ncoeffs] = { - - 35*one/65536, - 385*one/65536, - - 495*one/16384, - 1617*one/16384, - - 8085*one/32768, - 24255*one/32768, - 8085*one/16384, - - 1155*one/16384, - 693*one/65536, - - 55*one/65536 + - 35/RT(65536.0), + 385/RT(65536.0), + - 495/RT(16384.0), + 1617/RT(16384.0), + - 8085/RT(32768.0), + 24255/RT(32768.0), + 8085/RT(16384.0), + - 1155/RT(16384.0), + 693/RT(65536.0), + - 55/RT(65536.0) }; return coeffs[i]; } @@ -72,7 +71,7 @@ namespace CarpetLib { typedef typename typeprops<T>::real RT; T res = typeprops<T>::fromreal (0); for (int i=0; i<ncoeffs; ++i) { - res += coeff<RT>(i) * interp0 (p + i*d1); + res += coeff<RT>(i) * interp0<T> (p + i*d1); } return res; } @@ -88,7 +87,7 @@ namespace CarpetLib { typedef typename typeprops<T>::real RT; T res = typeprops<T>::fromreal (0); for (int i=0; i<ncoeffs; ++i) { - res += coeff<RT>(i) * interp1 (p + i*d2, d1); + res += coeff<RT>(i) * interp1<T> (p + i*d2, d1); } return res; } @@ -105,7 +104,7 @@ namespace CarpetLib { typedef typename typeprops<T>::real RT; T res = typeprops<T>::fromreal (0); for (int i=0; i<ncoeffs; ++i) { - res += coeff<RT>(i) * interp2 (p + i*d3, d1, d2); + res += coeff<RT>(i) * interp2<T> (p + i*d3, d1, d2); } return res; } @@ -243,7 +242,7 @@ namespace CarpetLib { // kernel l8000: - dst[DSTIND3(id,jd,kd)] = interp0 (& src[SRCIND3(is,js,ks)]); + dst[DSTIND3(id,jd,kd)] = interp0<T> (& src[SRCIND3(is,js,ks)]); i = i+1; id = id+1; if (i < regiext) goto l8001; @@ -251,7 +250,7 @@ namespace CarpetLib { // kernel l8001: - dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is-3,js,ks)], srcdi); + dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is-3,js,ks)], srcdi); i = i+1; id = id+1; is = is+1; @@ -275,7 +274,7 @@ namespace CarpetLib { // kernel l8010: - dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js-3,ks)], srcdj); + dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js-3,ks)], srcdj); i = i+1; id = id+1; if (i < regiext) goto l8011; @@ -284,7 +283,7 @@ namespace CarpetLib { // kernel l8011: dst[DSTIND3(id,jd,kd)] = - interp2 (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj); + interp2<T> (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj); i = i+1; id = id+1; is = is+1; @@ -324,7 +323,7 @@ namespace CarpetLib { // kernel l8100: - dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js,ks-3)], srcdk); + dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js,ks-3)], srcdk); i = i+1; id = id+1; if (i < regiext) goto l8101; @@ -333,7 +332,7 @@ namespace CarpetLib { // kernel l8101: dst[DSTIND3(id,jd,kd)] = - interp2 (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj); + interp2<T> (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj); i = i+1; id = id+1; is = is+1; @@ -358,7 +357,7 @@ namespace CarpetLib { // kernel l8110: dst[DSTIND3(id,jd,kd)] = - interp2 (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk); + interp2<T> (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk); i = i+1; id = id+1; if (i < regiext) goto l8111; @@ -368,7 +367,7 @@ namespace CarpetLib { l8111: { dst[DSTIND3(id,jd,kd)] = - interp3 (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk); + interp3<T> (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk); } i = i+1; id = id+1; |