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, 30 insertions, 30 deletions

diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c
index 92299d4..8671e6e 100644
--- a/src/ReductionNorm1.c
+++ b/src/ReductionNorm1.c
@@ -256,22 +256,22 @@ static int ReductionL1 (int N_dims, int operator_handle,
       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);
       break;
-      #ifdef CCTK_INT1
+      #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);
       break;
       #endif                                                              
-      #ifdef CCTK_INT2
+      #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);
       break;
       #endif
-      #ifdef CCTK_INT4
+      #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);
       break;
       #endif
-      #ifdef CCTK_INT8
+      #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);
       break;                                                                
@@ -279,17 +279,17 @@ static int ReductionL1 (int N_dims, int operator_handle,
       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);
       break;
-      #ifdef CCTK_REAL4
+      #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);
       break;
       #endif
-      #ifdef CCTK_REAL8
+      #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);
       break;
       #endif
-      #ifdef CCTK_REAL16
+      #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);
       break;
@@ -297,17 +297,17 @@ static int ReductionL1 (int N_dims, int operator_handle,
       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);
       break;
-      #ifdef CCTK_COMPLEX8
+      #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);
       break;
       #endif
-      #ifdef CCTK_COMPLEX16
+      #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);
       break;
       #endif
-      #ifdef CCTK_COMPLEX32
+      #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);
       break;
@@ -345,22 +345,22 @@ static int ReductionL1 (int N_dims, int operator_handle,
             case CCTK_VARIABLE_INT:
               *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / weight_sum; 
             break;
-            #ifdef CCTK_INT1
+            #ifdef HAVE_CCTK_INT1
             case CCTK_VARIABLE_INT1:
               *( (CCTK_INT1 *) output_numbers[i]) = *( (CCTK_INT1 *) output_numbers[i]) / weight_sum; 
             break;
             #endif                                                              
-            #ifdef CCTK_INT2
+            #ifdef HAVE_CCTK_INT2
             case CCTK_VARIABLE_INT2:
               *( (CCTK_INT2 *) output_numbers[i]) = *( (CCTK_INT2 *) output_numbers[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_INT4
+            #ifdef HAVE_CCTK_INT4
             case CCTK_VARIABLE_INT4:
               *( (CCTK_INT4 *) output_numbers[i]) = *( (CCTK_INT4 *) output_numbers[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_INT8
+            #ifdef HAVE_CCTK_INT8
             case CCTK_VARIABLE_INT8:
               *( (CCTK_INT8 *) output_numbers[i]) = *( (CCTK_INT8 *) output_numbers[i]) / weight_sum; 
             break;                                                                
@@ -368,17 +368,17 @@ static int ReductionL1 (int N_dims, int operator_handle,
             case CCTK_VARIABLE_REAL:
               *( (CCTK_REAL *) output_numbers[i]) = *( (CCTK_REAL *) output_numbers[i]) / weight_sum; 
             break;
-            #ifdef CCTK_REAL4
+            #ifdef HAVE_CCTK_REAL4
             case CCTK_VARIABLE_REAL4:
               *( (CCTK_REAL4 *) output_numbers[i]) = *( (CCTK_REAL4 *) output_numbers[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_REAL8
+            #ifdef HAVE_CCTK_REAL8
             case CCTK_VARIABLE_REAL8:
               *( (CCTK_REAL8 *) output_numbers[i]) = *( (CCTK_REAL8 *) output_numbers[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_REAL16
+            #ifdef HAVE_CCTK_REAL16
             case CCTK_VARIABLE_REAL16:
               *( (CCTK_REAL16 *) output_numbers[i]) = *( (CCTK_REAL16 *) output_numbers[i]) / weight_sum; 
             break;
@@ -387,19 +387,19 @@ static int ReductionL1 (int N_dims, int operator_handle,
               (*( (CCTK_COMPLEX *) output_numbers[i])).Re = (*( (CCTK_COMPLEX *) output_numbers[i])).Re / weight_sum; 
               (*( (CCTK_COMPLEX *) output_numbers[i])).Im = (*( (CCTK_COMPLEX *) output_numbers[i])).Im / weight_sum; 
             break;
-            #ifdef CCTK_COMPLEX8
+            #ifdef HAVE_CCTK_COMPLEX8
             case CCTK_VARIABLE_COMPLEX8:
               (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re / weight_sum; 
               (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_COMPLEX16
+            #ifdef HAVE_CCTK_COMPLEX16
             case CCTK_VARIABLE_COMPLEX16:
             (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re / weight_sum; 
             (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_COMPLEX32
+            #ifdef HAVE_CCTK_COMPLEX32
             case CCTK_VARIABLE_COMPLEX32:
               (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re / weight_sum; 
               (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im / weight_sum; 
@@ -427,22 +427,22 @@ static int ReductionL1 (int N_dims, int operator_handle,
           case CCTK_VARIABLE_INT:
             *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; 
           break;
-          #ifdef CCTK_INT1
+          #ifdef HAVE_CCTK_INT1
           case CCTK_VARIABLE_INT1:
             *( (CCTK_INT1 *) output_numbers[i]) = *( (CCTK_INT1 *) output_numbers[i]) / num_points; 
           break;
           #endif                                                              
-          #ifdef CCTK_INT2
+          #ifdef HAVE_CCTK_INT2
           case CCTK_VARIABLE_INT2:
             *( (CCTK_INT2 *) output_numbers[i]) = *( (CCTK_INT2 *) output_numbers[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_INT4
+          #ifdef HAVE_CCTK_INT4
           case CCTK_VARIABLE_INT4:
             *( (CCTK_INT4 *) output_numbers[i]) = *( (CCTK_INT4 *) output_numbers[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_INT8
+          #ifdef HAVE_CCTK_INT8
           case CCTK_VARIABLE_INT8:
             *( (CCTK_INT8 *) output_numbers[i]) = *( (CCTK_INT8 *) output_numbers[i]) / num_points; 
           break;                                                                
@@ -450,17 +450,17 @@ static int ReductionL1 (int N_dims, int operator_handle,
           case CCTK_VARIABLE_REAL:
             *( (CCTK_REAL *) output_numbers[i]) = *( (CCTK_REAL *) output_numbers[i]) / num_points; 
           break;
-          #ifdef CCTK_REAL4
+          #ifdef HAVE_CCTK_REAL4
           case CCTK_VARIABLE_REAL4:
             *( (CCTK_REAL4 *) output_numbers[i]) = *( (CCTK_REAL4 *) output_numbers[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_REAL8
+          #ifdef HAVE_CCTK_REAL8
           case CCTK_VARIABLE_REAL8:
             *( (CCTK_REAL8 *) output_numbers[i]) = *( (CCTK_REAL8 *) output_numbers[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_REAL16
+          #ifdef HAVE_CCTK_REAL16
           case CCTK_VARIABLE_REAL16:
             *( (CCTK_REAL16 *) output_numbers[i]) = *( (CCTK_REAL16 *) output_numbers[i]) / num_points; 
           break;
@@ -469,19 +469,19 @@ static int ReductionL1 (int N_dims, int operator_handle,
             (*( (CCTK_COMPLEX *) output_numbers[i])).Re = (*( (CCTK_COMPLEX *) output_numbers[i])).Re / num_points; 
             (*( (CCTK_COMPLEX *) output_numbers[i])).Im = (*( (CCTK_COMPLEX *) output_numbers[i])).Im / num_points; 
           break;
-          #ifdef CCTK_COMPLEX8
+          #ifdef HAVE_CCTK_COMPLEX8
           case CCTK_VARIABLE_COMPLEX8:
             (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re / num_points; 
             (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im / num_points; 
           break;
           #endif
-          #ifdef CCTK_COMPLEX16
+          #ifdef HAVE_CCTK_COMPLEX16
           case CCTK_VARIABLE_COMPLEX16:
           (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re / num_points; 
           (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im / num_points; 
           break;
           #endif
-          #ifdef CCTK_COMPLEX32
+          #ifdef HAVE_CCTK_COMPLEX32
           case CCTK_VARIABLE_COMPLEX32:
             (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re / num_points; 
             (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im / num_points;