most minor fixes and indentation stuff

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@32 7daa882c-dc44-4453-834e-278d26b18e6a

1 files changed, 60 insertions, 52 deletions

diff --git a/src/ReductionSum.c b/src/ReductionSum.c
index 3eaaf4f..fac4c79 100644
--- a/src/ReductionSum.c
+++ b/src/ReductionSum.c
@@ -194,14 +194,14 @@ 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, 
-              N_input_arrays, input_array_offsets, "input_array_offsets");  
-     ierr = 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, 
-              N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
-     ierr = 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, 
+             N_input_arrays, input_array_offsets, "input_array_offsets");  
+    ierr = 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, 
+             N_dims, input_array_min_subscripts, "input_array_min_subscripts");  
+    ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, 
+             N_dims, input_array_max_subscripts, "input_array_max_subscripts");  
   }
 
   /* for masks get values from param table (it they exist) */
@@ -294,9 +294,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -362,9 +362,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -431,9 +431,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -501,9 +501,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -571,9 +571,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -641,9 +641,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -710,9 +710,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -779,9 +779,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -849,9 +849,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -875,8 +875,8 @@ static int ReductionSum (int N_dims, int operator_handle,
       }
       break;
       #endif
-      #ifdef CCTK_REAL6
-      case CCTK_VARIABLE_REAL6:
+      #ifdef CCTK_REAL16
+      case CCTK_VARIABLE_REAL16:
       switch (output_number_type_codes[i])
       {
         /* out values type switches*/
@@ -919,9 +919,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -988,9 +988,9 @@ static int ReductionSum (int N_dims, int operator_handle,
 /*        ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)*/
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-/*        ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)*/
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+/*        ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)*/
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -1057,9 +1057,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -1127,9 +1127,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -1197,9 +1197,9 @@ static int ReductionSum (int N_dims, int operator_handle,
         ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL8, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
-        #ifdef CCTK_REAL6
-        case CCTK_VARIABLE_REAL6:
-        ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL6, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
+        #ifdef CCTK_REAL16
+        case CCTK_VARIABLE_REAL16:
+        ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL16, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,product)
         break;
         #endif
         case CCTK_VARIABLE_COMPLEX:
@@ -1226,6 +1226,14 @@ static int ReductionSum (int N_dims, int operator_handle,
     }
   }
 
+  /* store the number of points in the paramater table */
+  if ( Util_TableQueryNKeys(param_table_handle) != 0)
+  {
+    ierr = Util_TableSetInt(param_table_handle, num_points, "num_points");
+    ierr = Util_TableSetInt(param_table_handle, 3,"mpi_operation");
+    ierr = Util_TableSetInt(param_table_handle, 1,"perform_division");
+  }
+
   /* free memory */
   free (iters_per_dim);
   free (indices);