diff options
| author | Christian Reisswig <reisswig@tapir.caltech.edu> | 2011-06-07 17:41:56 -0700 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:26:25 +0000 |
| commit | 04b7e40820bc9cd06ecb3325a2ec2d700a882f08 (patch) | |
| tree | 90ce5d4390e95e9a55d45c9451f87ed0aebad233 /Carpet | |
| parent | c1fb1d45924159fa8fe96cfbfdcd6cdc5e6d0bc3 (diff) | |
Correct index check for eno operators.
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc | 16 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc | 1 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc index 82ab24c48..0ebb2f03d 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc @@ -753,8 +753,8 @@ namespace CarpetLib { #ifdef CARPET_DEBUG typedef typename typeprops<T>::real RT; typedef coeffs1d<RT,ORDER,di> coeffs; - assert (is + coeffs::imin >= 0); - assert (is + coeffs::imax <= srciext); + assert (is + coeffs::minimin >= 0); + assert (is + coeffs::maximax <= srciext); check_indices0<T,ORDER> (); #endif } @@ -770,8 +770,8 @@ namespace CarpetLib { #ifdef CARPET_DEBUG typedef typename typeprops<T>::real RT; typedef coeffs1d<RT,ORDER,dj> coeffs; - assert (js + coeffs::imin >= 0); - assert (js + coeffs::imax <= srcjext); + assert (js + coeffs::minimin >= 0); + assert (js + coeffs::maximax <= srcjext); check_indices1<T,ORDER,di> (is, srciext); #endif } @@ -789,8 +789,8 @@ namespace CarpetLib { #ifdef CARPET_DEBUG typedef typename typeprops<T>::real RT; typedef coeffs1d<RT,ORDER,dk> coeffs; - assert (ks + coeffs::imin >= 0); - assert (ks + coeffs::imax <= srckext); + assert (ks + coeffs::minimin >= 0); + assert (ks + coeffs::maximax <= srckext); check_indices2<T,ORDER,di,dj> (is,js, srciext,srcjext); #endif } @@ -869,7 +869,6 @@ namespace CarpetLib { } - if (not regbbox.expand(offsetlo, offsethi).is_contained_in(srcbbox) or not regbbox .is_contained_in(dstbbox)) { @@ -921,8 +920,6 @@ namespace CarpetLib { size_t const j0 = srcjoff / 2; size_t const k0 = srckoff / 2; - - // size_t const srcdi = SRCIND3(1,0,0) - SRCIND3(0,0,0); size_t const srcdi = 1; assert (srcdi == SRCIND3(1,0,0) - SRCIND3(0,0,0)); @@ -1172,7 +1169,6 @@ namespace CarpetLib { #define TYPECASE(N,T) \ \ \ - \ template \ void \ prolongate_3d_cc_eno_rf2<T,2> (T const * restrict const src, \ diff --git a/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc index c24704298..19495a105 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc @@ -436,7 +436,6 @@ namespace CarpetLib { size_t const k0 = srckoff / 2; - // size_t const srcdi = SRCIND3(1,0,0) - SRCIND3(0,0,0); size_t const srcdi = 1; assert (srcdi == SRCIND3(1,0,0) - SRCIND3(0,0,0)); |