Properly distinguish between int and CCTK_INTsvn

git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/SummationByParts/trunk@148 f69c4107-0314-4c4f-9ad4-17e986b73f4a

1 files changed, 24 insertions, 22 deletions

diff --git a/src/dissipation.c b/src/dissipation.c
index 690fce7..026f123 100644
--- a/src/dissipation.c
+++ b/src/dissipation.c
@@ -234,12 +234,7 @@ apply (int const varindex, char const * const optstring, void * const arg)
   int onesided[6];
   CCTK_INT npatches, patch;
   CCTK_INT offset[6];
-  int type;
   int i;
-
-  CCTK_INT nboundaryzones[6];
-  CCTK_INT is_internal[6];
-  CCTK_INT is_staggered[6];
   
   assert (varindex >= 0);
   
@@ -303,22 +298,29 @@ apply (int const varindex, char const * const optstring, void * const arg)
   assert (varptr);
   rhsptr = CCTK_VarDataPtrI (cctkGH, 0, rhsindex);
   assert (rhsptr);
+
+  CCTK_INT lsh[3], gsh[3], lbnd[3];
+  for (int d=0; d<3; ++d) {
+    lsh[d] = cctk_lsh[d];
+    gsh[d] = cctk_gsh[d];
+    lbnd[d] = cctk_lbnd[d];
+  }
   
   if ( CCTK_Equals(norm_type,"Diagonal") ) {
     switch(order) {
     case 2: {
       if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) {
         CCTK_FNAME(dissipation_2_1)
-          (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+          (varptr, &lsh[0], &lsh[1], &lsh[2],
                             bbox, gsize, offset, dx, &epsdis, rhsptr);
       } else {
         if (!use_variable_deltas) {
           CCTK_FNAME(dissipation_2_1_alt)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset, dx, &epsdis, rhsptr);
         } else {
           CCTK_FNAME(dissipation_2_1_delta)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset,
                               sbp_dx, sbp_dy, sbp_dz, &epsdis, rhsptr);
         }
@@ -328,16 +330,16 @@ apply (int const varindex, char const * const optstring, void * const arg)
     case 4: {
       if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) {
         CCTK_FNAME(dissipation_4_2)
-          (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+          (varptr, &lsh[0], &lsh[1], &lsh[2],
                             bbox, gsize, offset, dx, &epsdis, rhsptr);
       } else {
         if (!use_variable_deltas) {
           CCTK_FNAME(dissipation_4_2_alt)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset, dx, &epsdis, rhsptr);
         } else {
           CCTK_FNAME(dissipation_4_2_delta)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset,
                               sbp_dx, sbp_dy, sbp_dz, &epsdis, rhsptr);
         }
@@ -347,16 +349,16 @@ apply (int const varindex, char const * const optstring, void * const arg)
     case 6: {
       if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) {
         CCTK_FNAME(dissipation_6_3)
-          (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+          (varptr, &lsh[0], &lsh[1], &lsh[2],
                             bbox, gsize, offset, dx, &epsdis, rhsptr);
       } else {
         if (!use_variable_deltas) {
           CCTK_FNAME(dissipation_6_3_alt)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset, dx, &epsdis, rhsptr);
         } else {
           CCTK_FNAME(dissipation_6_3_delta)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset,
                               sbp_dx, sbp_dy, sbp_dz, &epsdis, rhsptr);
         }
@@ -366,16 +368,16 @@ apply (int const varindex, char const * const optstring, void * const arg)
     case 8: {
       if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) {
         CCTK_FNAME(dissipation_8_4)
-          (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+          (varptr, &lsh[0], &lsh[1], &lsh[2],
                             bbox, gsize, offset, dx, &epsdis, rhsptr);
       } else {
         if (!use_variable_deltas) {
           CCTK_FNAME(dissipation_8_4_alt)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset, dx, &epsdis, rhsptr);
         } else {
           CCTK_FNAME(dissipation_8_4_delta)
-            (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+            (varptr, &lsh[0], &lsh[1], &lsh[2],
                               bbox, gsize, offset,
                               sbp_dx, sbp_dy, sbp_dz, &epsdis, rhsptr);
         }
@@ -392,11 +394,11 @@ apply (int const varindex, char const * const optstring, void * const arg)
     case 4: {
       if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) {
       CCTK_FNAME(dissipation_4_3_opt)
-        (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset,
+        (varptr, lsh, gsh, lbnd, bbox, gsize, offset,
                       dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr);
       } else {
       CCTK_FNAME(dissipation_4_3_alt)
-        (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset,
+        (varptr, lsh, gsh, lbnd, bbox, gsize, offset,
                       dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr);
       }
       break;
@@ -404,11 +406,11 @@ apply (int const varindex, char const * const optstring, void * const arg)
     case 6: {
       if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) {
         CCTK_FNAME(dissipation_6_5_opt)
-          (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset,
+          (varptr, lsh, gsh, lbnd, bbox, gsize, offset,
                         dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr);
       } else {
         CCTK_FNAME(dissipation_6_5_alt)
-          (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset,
+          (varptr, lsh, gsh, lbnd, bbox, gsize, offset,
                         dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr);
       }
       break;
@@ -419,7 +421,7 @@ apply (int const varindex, char const * const optstring, void * const arg)
   }
 
   if (poison_dissipation) {
-      CCTK_FNAME(SBP_Poisoning)(&cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2],
+      CCTK_FNAME(SBP_Poisoning)(&lsh[0], &lsh[1], &lsh[2],
                                 bbox, offset, rhsptr);
   }
 }