remove unused variables to remove compiler warnings

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/LocalReduce/trunk@100 7daa882c-dc44-4453-834e-278d26b18e6a
author: knarf <knarf@7daa882c-dc44-4453-834e-278d26b18e6a> 2012-12-14 17:36:40 +0000
committer: knarf <knarf@7daa882c-dc44-4453-834e-278d26b18e6a> 2012-12-14 17:36:40 +0000
commit: 8c9f679ed62bca71c66410ddd25df6168d7a6202 (patch)
tree: 5973caf9b7eb74d81af7c21b63893dc72db38fe3
parent: a474b9f90260da6786cd586be3faa52bc3cd3f4c (diff)
10 files changed, 217 insertions, 238 deletions
diff --git a/src/ReductionAvg.c b/src/ReductionAvg.c
index bf766d1..0cd1399 100644
--- a/src/ReductionAvg.c
+++ b/src/ReductionAvg.c
@@ -135,7 +135,6 @@ static int ReductionAvg (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -193,23 +192,22 @@ static int ReductionAvg (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -247,82 +245,82 @@ static int ReductionAvg (int N_dims, int operator_handle,
     {
     /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_Avg_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_Avg_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_Avg_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_Avg_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_Avg_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_Avg_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_Avg_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_Avg_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_Avg_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_Avg_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_Avg_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_Avg_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_Avg_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_Avg_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Avg_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_division");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, 0,"perform_division");
   }
   else
   {
diff --git a/src/ReductionCount.c b/src/ReductionCount.c
index e9db529..0eb0dda 100644
--- a/src/ReductionCount.c
+++ b/src/ReductionCount.c
@@ -135,7 +135,6 @@ static int ReductionCount (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -155,7 +154,6 @@ static int ReductionCount (int N_dims, int operator_handle,
   /* weight variables declared here */
   int weight_on = 0;          /* weight is by default off=0 */
   void const * weight;        /* pointer to the weight variable */  
-  CCTK_REAL weight_sum;
 
   /* prevent warnings for unused vars */
   (void)(operator_handle + 0);
@@ -193,23 +191,22 @@ static int ReductionCount (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-     ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+     Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
               N_input_arrays, input_array_offsets, "input_array_offsets");  
-     ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+     Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
               N_dims, input_array_strides, "input_array_strides");  
-     ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+     Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
               N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-     ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+     Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
               N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -247,80 +244,80 @@ static int ReductionCount (int N_dims, int operator_handle,
     {
     /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_Count_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_Count_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_Count_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_Count_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_Count_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_Count_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_Count_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_Count_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_Count_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_Count_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_Count_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_Count_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_Count_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_Count_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Count_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
-  /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  /* Get the values of num_points */
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
   }
 
   /* free memory */
diff --git a/src/ReductionMax.c b/src/ReductionMax.c
index 5da25b9..34dc2d7 100644
--- a/src/ReductionMax.c
+++ b/src/ReductionMax.c
@@ -135,7 +135,6 @@ static int ReductionMax (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -192,23 +191,22 @@ static int ReductionMax (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
               N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -238,80 +236,80 @@ static int ReductionMax (int N_dims, int operator_handle,
     {
       /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_Max_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_Max_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_Max_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_Max_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_Max_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_Max_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_Max_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_Max_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_Max_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_Max_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_Max_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_Max_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_Max_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_Max_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Max_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
   /* Get the values of num_points */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
   num_points--;
   
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 1,"global_operation");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 1,"global_operation");
   }
 
   /* free memory */
diff --git a/src/ReductionMin.c b/src/ReductionMin.c
index 0e68d23..94965a3 100644
--- a/src/ReductionMin.c
+++ b/src/ReductionMin.c
@@ -136,7 +136,6 @@ static int ReductionMin (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -194,23 +193,22 @@ static int ReductionMin (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -305,18 +303,18 @@ static int ReductionMin (int N_dims, int operator_handle,
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 2,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 1,"perform_division");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 2,"global_operation");
+    Util_TableSetInt(param_table_handle, 1,"perform_division");
   }
 
   /* free memory */
diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c
index 8671e6e..675d2c9 100644
--- a/src/ReductionNorm1.c
+++ b/src/ReductionNorm1.c
@@ -135,7 +135,6 @@ static int ReductionL1 (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -193,23 +192,22 @@ static int ReductionL1 (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -251,82 +249,82 @@ static int ReductionL1 (int N_dims, int operator_handle,
     {
     /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_Norm1_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_Norm1_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_Norm1_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_Norm1_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_Norm1_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_Norm1_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_Norm1_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_Norm1_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_Norm1_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_Norm1_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_Norm1_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_Norm1_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_Norm1_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_Norm1_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm1_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_division");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, 0,"perform_division");
   }
   else
   {
diff --git a/src/ReductionNorm2.c b/src/ReductionNorm2.c
index c3b791a..0e25b00 100644
--- a/src/ReductionNorm2.c
+++ b/src/ReductionNorm2.c
@@ -136,7 +136,6 @@ static int ReductionL2 (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -206,23 +205,22 @@ static int ReductionL2 (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -330,18 +328,18 @@ static int ReductionL2 (int N_dims, int operator_handle,
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_division");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_2_root");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, 0,"perform_division");
+    Util_TableSetInt(param_table_handle, 0,"perform_2_root");
   }
   else
   {
diff --git a/src/ReductionNorm3.c b/src/ReductionNorm3.c
index 6e67519..c45b8b6 100644
--- a/src/ReductionNorm3.c
+++ b/src/ReductionNorm3.c
@@ -136,7 +136,6 @@ static int ReductionL3 (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -206,23 +205,22 @@ static int ReductionL3 (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -262,83 +260,83 @@ static int ReductionL3 (int N_dims, int operator_handle,
     {
     /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_Norm3_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_Norm3_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_Norm3_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_Norm3_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_Norm3_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_Norm3_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_Norm3_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_Norm3_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_Norm3_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_Norm3_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_Norm3_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_Norm3_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_Norm3_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_Norm3_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm3_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_division");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_3_root");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, 0,"perform_division");
+    Util_TableSetInt(param_table_handle, 0,"perform_3_root");
   }
   else
   {
diff --git a/src/ReductionNorm4.c b/src/ReductionNorm4.c
index 1685c7c..6c6fb6f 100644
--- a/src/ReductionNorm4.c
+++ b/src/ReductionNorm4.c
@@ -136,7 +136,6 @@ static int ReductionL4 (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -206,23 +205,22 @@ static int ReductionL4 (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -262,83 +260,83 @@ static int ReductionL4 (int N_dims, int operator_handle,
     {
     /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_Norm4_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_Norm4_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_Norm4_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_Norm4_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_Norm4_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_Norm4_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_Norm4_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_Norm4_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_Norm4_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_Norm4_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_Norm4_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_Norm4_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_Norm4_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_Norm4_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_Norm4_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_division");
-    ierr = Util_TableSetInt(param_table_handle, 0,"perform_4_root");    
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, 0,"perform_division");
+    Util_TableSetInt(param_table_handle, 0,"perform_4_root");    
   }
   else
   {
diff --git a/src/ReductionNormInf.c b/src/ReductionNormInf.c
index 490c9aa..060d3b0 100644
--- a/src/ReductionNormInf.c
+++ b/src/ReductionNormInf.c
@@ -135,7 +135,6 @@ static int ReductionLInf (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -193,23 +192,22 @@ static int ReductionLInf (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -256,81 +254,81 @@ static int ReductionLInf (int N_dims, int operator_handle,
     {
     /* in values type switches*/
       case CCTK_VARIABLE_BYTE:
-        ierr = LocalReduce_NormInf_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_BYTE(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       case CCTK_VARIABLE_INT:
-        ierr = LocalReduce_NormInf_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_INT(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
-        ierr = LocalReduce_NormInf_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_INT1(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif                                                              
       #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
-        ierr = LocalReduce_NormInf_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_INT2(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
-        ierr = LocalReduce_NormInf_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_INT4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
-        ierr = LocalReduce_NormInf_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_INT8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;                                                                
       #endif
       case CCTK_VARIABLE_REAL:
-        ierr = LocalReduce_NormInf_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_REAL(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
-        ierr = LocalReduce_NormInf_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_REAL4(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
-        ierr = LocalReduce_NormInf_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_REAL8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
-        ierr = LocalReduce_NormInf_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_REAL16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif  
       case CCTK_VARIABLE_COMPLEX:
-        ierr = LocalReduce_NormInf_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_COMPLEX(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
-        ierr = LocalReduce_NormInf_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_COMPLEX8(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
-        ierr = LocalReduce_NormInf_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_COMPLEX16(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
       #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
-        ierr = LocalReduce_NormInf_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
+        LocalReduce_NormInf_COMPLEX32(i, weight_on, weight, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim,   N_dims, input_arrays, output_number_type_codes, output_numbers, param_table_handle);
       break;
       #endif
     }
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 1,"global_operation");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 1,"global_operation");
   }
   
   /* free memory */
diff --git a/src/ReductionSum.c b/src/ReductionSum.c
index bac8635..61c96a2 100644
--- a/src/ReductionSum.c
+++ b/src/ReductionSum.c
@@ -137,7 +137,6 @@ static int ReductionSum (int N_dims, int operator_handle,
 {
   /* utility variables */
   int i, j, num_points;
-  int ierr;
   int * iters_per_dim;
   int global_calling = 0;
 
@@ -195,23 +194,22 @@ static int ReductionSum (int N_dims, int operator_handle,
   /* for strides and subscripts get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_input_arrays, input_array_offsets, "input_array_offsets");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_strides, "input_array_strides");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+    Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
              N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for weights get values from param table (it they exist) */
   if ( Util_TableQueryNKeys(param_table_handle) != 0)
   {
-    ierr = 0;
     /* Get the weight_on parameter and the weight_var_index parameter */
-    ierr = Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
-    ierr = Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
+    Util_TableGetInt(param_table_handle, &weight_on, "weight_on");
+    Util_TableGetPointerToConst(param_table_handle, &weight, "weight");
     /* Need to add more checking here for size, storage */
   }
 
@@ -314,17 +312,17 @@ static int ReductionSum (int N_dims, int operator_handle,
   }
 
   /* Get the values of num_points and weight_sum */
-  ierr = Util_TableGetInt(param_table_handle, &num_points, "num_points");
-  ierr = Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
+  Util_TableGetInt(param_table_handle, &num_points, "num_points");
+  Util_TableGetReal(param_table_handle, &weight_sum, "weight_sum");
   num_points--;
 
   /* store the number of points in the paramater table  and perform division */
-  ierr = Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
+  Util_TableGetInt(param_table_handle, &global_calling, "global_calling");
   if ( global_calling != 0)
   {
-    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
-    ierr = Util_TableSetInt(param_table_handle, 3,"global_operation");
-    ierr = Util_TableSetInt(param_table_handle, 1,"perform_division");
+    Util_TableSetInt(param_table_handle, num_points, "num_points");
+    Util_TableSetInt(param_table_handle, 3,"global_operation");
+    Util_TableSetInt(param_table_handle, 1,"perform_division");
   }
 
   /* free memory */
author	knarf <knarf@7daa882c-dc44-4453-834e-278d26b18e6a>	2012-12-14 17:36:40 +0000
committer	knarf <knarf@7daa882c-dc44-4453-834e-278d26b18e6a>	2012-12-14 17:36:40 +0000
commit	8c9f679ed62bca71c66410ddd25df6168d7a6202 (patch)
tree	5973caf9b7eb74d81af7c21b63893dc72db38fe3
parent	a474b9f90260da6786cd586be3faa52bc3cd3f4c (diff)