diff options
Diffstat (limited to 'Carpet/CarpetLib/src/interpolate_3d_2tl.cc')
| -rw-r--r-- | Carpet/CarpetLib/src/interpolate_3d_2tl.cc | 60 |
1 files changed, 15 insertions, 45 deletions
diff --git a/Carpet/CarpetLib/src/interpolate_3d_2tl.cc b/Carpet/CarpetLib/src/interpolate_3d_2tl.cc index 27b290733..df696871f 100644 --- a/Carpet/CarpetLib/src/interpolate_3d_2tl.cc +++ b/Carpet/CarpetLib/src/interpolate_3d_2tl.cc @@ -32,28 +32,18 @@ namespace CarpetLib { CCTK_REAL const t1, T const * restrict const src2, CCTK_REAL const t2, - ivect3 const & srcext, + ivect3 const & restrict srcext, T * restrict const dst, CCTK_REAL const t, - ivect3 const & dstext, - ibbox3 const & srcbbox, - ibbox3 const & dstbbox, - ibbox3 const & regbbox) + ivect3 const & restrict dstext, + ibbox3 const & restrict srcbbox, + ibbox3 const & restrict dstbbox, + ibbox3 const & restrict regbbox) { typedef typename typeprops<T>::real RT; -#if 0 - // This is already guaranteed by bbox - if (any (srcbbox.stride() == 0 or - dstbbox.stride() == 0 or - regbbox.stride() == 0)) - { - CCTK_WARN (0, "Internal error: stride is zero"); - } -#endif - if (any (srcbbox.stride() != regbbox.stride() or dstbbox.stride() != regbbox.stride())) { @@ -64,32 +54,12 @@ namespace CarpetLib { CCTK_WARN (0, "Internal error: strides disagree"); } -#if 0 - // This needs to be allowed for cell centring - if (any (srcbbox.lower() % srcbbox.stride() != 0 or - dstbbox.lower() % dstbbox.stride() != 0 or - regbbox.lower() % regbbox.stride() != 0)) - { - CCTK_WARN (0, "Internal error: array origins are not integer multiples of the strides"); - } -#endif - // This could be handled, but is likely to point to an error // elsewhere if (regbbox.empty()) { CCTK_WARN (0, "Internal error: region extent is empty"); } -#if 0 - // This is already guaranteed by bbox - if (any ((srcbbox.upper() - srcbbox.lower()) % srcbbox.stride() != 0 or - (dstbbox.upper() - dstbbox.lower()) % dstbbox.stride() != 0 or - (regbbox.upper() - regbbox.lower()) % regbbox.stride() != 0)) - { - CCTK_WARN (0, "Internal error: array extents are not integer multiples of the strides"); - } -#endif - if (not regbbox.is_contained_in(srcbbox) or not regbbox.is_contained_in(dstbbox)) { @@ -172,13 +142,13 @@ namespace CarpetLib { CCTK_REAL const t1, CCTK_REAL const * restrict const src2, CCTK_REAL const t2, - ivect3 const & srcext, + ivect3 const & restrict srcext, CCTK_REAL * restrict const dst, CCTK_REAL const t, - ivect3 const & dstext, - ibbox3 const & srcbbox, - ibbox3 const & dstbbox, - ibbox3 const & regbbox); + ivect3 const & restrict dstext, + ibbox3 const & restrict srcbbox, + ibbox3 const & restrict dstbbox, + ibbox3 const & restrict regbbox); template void @@ -186,13 +156,13 @@ namespace CarpetLib { CCTK_REAL const t1, CCTK_COMPLEX const * restrict const src2, CCTK_REAL const t2, - ivect3 const & srcext, + ivect3 const & restrict srcext, CCTK_COMPLEX * restrict const dst, CCTK_REAL const t, - ivect3 const & dstext, - ibbox3 const & srcbbox, - ibbox3 const & dstbbox, - ibbox3 const & regbbox); + ivect3 const & restrict dstext, + ibbox3 const & restrict srcbbox, + ibbox3 const & restrict dstbbox, + ibbox3 const & restrict regbbox); |