CarpetLib: Clean up transport operators

Remove unused, #ifdef'ed out code from the operators.  Since the
operators use now the bbox class, this checking is already performed
there.

Remove unused debugging code in the cell-centered operators.

Use the restrict qualifier in the prototypes.

darcs-hash:20070204174027-dae7b-743583b30d52646219411c98ad99486d10445e52.gz

1 files changed, 15 insertions, 45 deletions

diff --git a/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc b/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
index 9c0fbccb0..b45ba8f93 100644
--- a/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
+++ b/Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc
@@ -28,12 +28,12 @@ namespace CarpetLib {
   template <typename T>
   void
   restrict_3d_cc_rf2 (T const * restrict const src,
-                      ivect3 const & srcext,
+                      ivect3 const & restrict srcext,
                       T * restrict const dst,
-                      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)
   {
     DECLARE_CCTK_PARAMETERS;
     
@@ -41,16 +41,6 @@ namespace CarpetLib {
     
     
     
-#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()))
     {
@@ -61,32 +51,12 @@ namespace CarpetLib {
       CCTK_WARN (0, "Internal error: destination strides are not twice the source strides");
     }
     
-#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.expanded_for(srcbbox).is_contained_in(srcbbox) or
         not regbbox.is_contained_in(dstbbox))
     {
@@ -169,22 +139,22 @@ namespace CarpetLib {
   template
   void
   restrict_3d_cc_rf2 (CCTK_REAL const * restrict const src,
-                      ivect3 const & srcext,
+                      ivect3 const & restrict srcext,
                       CCTK_REAL * restrict const dst,
-                      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
   restrict_3d_cc_rf2 (CCTK_COMPLEX const * restrict const src,
-                      ivect3 const & srcext,
+                      ivect3 const & restrict srcext,
                       CCTK_COMPLEX * restrict const dst,
-                      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);