From 40312b0b076541037ae09a4ca0399285f5910696 Mon Sep 17 00:00:00 2001
From: Christian Reisswig <reisswig@tapir.caltech.edu>
Date: Tue, 7 Jun 2011 17:41:56 -0700
Subject: Correct index check for eno operators.

---
 Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc | 16 ++++++----------
 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));
-- 
cgit v1.2.3