1 files changed, 26 insertions, 28 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
   {