diff options
Diffstat (limited to 'src/AvgFunctions.c')
| -rw-r--r-- | src/AvgFunctions.c | 458 |
1 files changed, 229 insertions, 229 deletions
diff --git a/src/AvgFunctions.c b/src/AvgFunctions.c index d30dbe1..9d7a89a 100644 --- a/src/AvgFunctions.c +++ b/src/AvgFunctions.c @@ -51,22 +51,22 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -74,17 +74,17 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -129,7 +129,7 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -150,8 +150,8 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -170,7 +170,7 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -191,8 +191,8 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -212,7 +212,7 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -233,8 +233,8 @@ int LocalReduce_Avg_BYTE(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -292,22 +292,22 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -315,17 +315,17 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -369,7 +369,7 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -390,8 +390,8 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -410,7 +410,7 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -431,8 +431,8 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_COMPLEX16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -451,7 +451,7 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -472,8 +472,8 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -530,22 +530,22 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT11 + #ifdef HAVE_CCTK_INT11 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT12 + #ifdef HAVE_CCTK_INT12 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT14 + #ifdef HAVE_CCTK_INT14 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT18 + #ifdef HAVE_CCTK_INT18 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -553,17 +553,17 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -607,7 +607,7 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -628,8 +628,8 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -648,7 +648,7 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -669,8 +669,8 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -690,7 +690,7 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -711,8 +711,8 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -771,22 +771,22 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT21 + #ifdef HAVE_CCTK_INT21 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT22 + #ifdef HAVE_CCTK_INT22 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT24 + #ifdef HAVE_CCTK_INT24 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT28 + #ifdef HAVE_CCTK_INT28 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -794,17 +794,17 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -848,7 +848,7 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -869,8 +869,8 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -889,7 +889,7 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -910,8 +910,8 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -931,7 +931,7 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -952,8 +952,8 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1012,22 +1012,22 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1035,17 +1035,17 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1089,7 +1089,7 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1110,8 +1110,8 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -1130,7 +1130,7 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1151,8 +1151,8 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1172,7 +1172,7 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1193,8 +1193,8 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1253,22 +1253,22 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1276,17 +1276,17 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1330,7 +1330,7 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1351,8 +1351,8 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -1371,7 +1371,7 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1392,8 +1392,8 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1413,7 +1413,7 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1434,8 +1434,8 @@ int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1493,22 +1493,22 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1516,17 +1516,17 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1570,7 +1570,7 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1591,8 +1591,8 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -1611,7 +1611,7 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1632,8 +1632,8 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1653,7 +1653,7 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1674,8 +1674,8 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1733,22 +1733,22 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1756,17 +1756,17 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1810,7 +1810,7 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1831,8 +1831,8 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -1851,7 +1851,7 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1872,8 +1872,8 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1893,7 +1893,7 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -1914,8 +1914,8 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_ #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1974,22 +1974,22 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -1997,17 +1997,17 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2051,7 +2051,7 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2072,8 +2072,8 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -2092,7 +2092,7 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2113,8 +2113,8 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2134,7 +2134,7 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2155,8 +2155,8 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2183,7 +2183,7 @@ int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_ } #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim, int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle) { int iter = 0; @@ -2216,22 +2216,22 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2239,17 +2239,17 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2293,7 +2293,7 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2314,8 +2314,8 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -2334,7 +2334,7 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2355,8 +2355,8 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2376,7 +2376,7 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2397,8 +2397,8 @@ int LocalReduce_Avg_REAL16(int i, int weight_on, const void * const weight, CCTK #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2467,22 +2467,22 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2490,17 +2490,17 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2545,7 +2545,7 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2556,8 +2556,8 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL4) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL4) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -2587,7 +2587,7 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2598,8 +2598,8 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL8) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL8) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2630,7 +2630,7 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2641,8 +2641,8 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL16) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL16) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2679,7 +2679,7 @@ int LocalReduce_Avg_COMPLEX(int i, int weight_on, const void * const weight, CCT } -#ifdef CCTK_COMPLEX8 +#ifdef HAVE_CCTK_COMPLEX8 int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim, int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle) { int iter = 0; @@ -2723,22 +2723,22 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2746,17 +2746,17 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -2801,7 +2801,7 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2812,8 +2812,8 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL4) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL4) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -2843,7 +2843,7 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2854,8 +2854,8 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL8) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL8) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2886,7 +2886,7 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2897,8 +2897,8 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL16) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL16) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2935,7 +2935,7 @@ int LocalReduce_Avg_COMPLEX8(int i, int weight_on, const void * const weight, CC } #endif -#ifdef CCTK_COMPLEX16 +#ifdef HAVE_CCTK_COMPLEX16 int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim, int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle) { int iter = 0; @@ -2979,22 +2979,22 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -3002,17 +3002,17 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -3057,7 +3057,7 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3068,8 +3068,8 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL4) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL4) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -3099,7 +3099,7 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3110,8 +3110,8 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL8) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL8) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -3142,7 +3142,7 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3153,8 +3153,8 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL16) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL16) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -3191,7 +3191,7 @@ int LocalReduce_Avg_COMPLEX16(int i, int weight_on, const void * const weight, C } #endif -#ifdef CCTK_COMPLEX32 +#ifdef HAVE_CCTK_COMPLEX32 int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim, int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle) { int iter = 0; @@ -3230,27 +3230,27 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C { /* out values type switches*/ case CCTK_VARIABLE_BYTE: - ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) + ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_BYTE, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_INT, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_INT1, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_INT2, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_INT4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_INT8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -3258,17 +3258,17 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C case CCTK_VARIABLE_REAL: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL4, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL16, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; @@ -3313,7 +3313,7 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3324,8 +3324,8 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL4) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL4) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd8( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd8( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx8Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx8Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX8, output_numbers[i], weight_on, weight, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) @@ -3355,7 +3355,7 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3366,8 +3366,8 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL8) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL8) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd16( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd16( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx16Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx16Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -3398,7 +3398,7 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3409,8 +3409,8 @@ int LocalReduce_Avg_COMPLEX32(int i, int weight_on, const void * const weight, C #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ (inval).Re = (CCTK_REAL16) (typed_vdata[sum_indices]).Re; (inval).Im = (CCTK_REAL16) (typed_vdata[sum_indices]).Im; -#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_CmplxAdd32( avg, scalar); -#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_CmplxAdd32( avg, scalar); +#define REDUCTION_OPERATION(avg, scalar) avg = CCTK_Cmplx32Add( avg, scalar); +#define WEIGHTED_REDUCTION_OPERATION(avg, scalar, weight) scalar.Re = scalar.Re * weight; scalar.Im = scalar.Im * weight; avg = CCTK_Cmplx32Add( avg, scalar); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) |