This patch switches checking from #ifdef cctk_* to #ifdef have_cctk*, otherwise it contains minor changes here and there, code cleanup and such. Please confirm testglobal and testlocal reduce

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/ReductionMin.c b/src/ReductionMin.c
index 55512b2..c3a0590 100644
--- a/src/ReductionMin.c
+++ b/src/ReductionMin.c
@@ -253,22 +253,22 @@ static int ReductionMin (int N_dims, int operator_handle,
       case CCTK_VARIABLE_INT:
         num_points = LocalReduce_Min_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 CCTK_INT1
+      #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         num_points = LocalReduce_Min_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 CCTK_INT2
+      #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         num_points = LocalReduce_Min_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 CCTK_INT4
+      #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         num_points = LocalReduce_Min_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 CCTK_INT8
+      #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         num_points = LocalReduce_Min_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;                                                                
@@ -276,17 +276,17 @@ static int ReductionMin (int N_dims, int operator_handle,
       case CCTK_VARIABLE_REAL:
         num_points = LocalReduce_Min_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 CCTK_REAL4
+      #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         num_points = LocalReduce_Min_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 CCTK_REAL8
+      #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         num_points = LocalReduce_Min_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 CCTK_REAL16
+      #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         num_points = LocalReduce_Min_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;
@@ -294,17 +294,17 @@ static int ReductionMin (int N_dims, int operator_handle,
       case CCTK_VARIABLE_COMPLEX:
         num_points = LocalReduce_Min_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 CCTK_COMPLEX8
+      #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
         num_points = LocalReduce_Min_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 CCTK_COMPLEX16
+      #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
         num_points = LocalReduce_Min_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 CCTK_COMPLEX32
+      #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
         num_points = LocalReduce_Min_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;