diff options
Diffstat (limited to 'src/NormInfFunctions.c')
| -rw-r--r-- | src/NormInfFunctions.c | 422 |
1 files changed, 211 insertions, 211 deletions
diff --git a/src/NormInfFunctions.c b/src/NormInfFunctions.c index 7663c3e..dee219d 100644 --- a/src/NormInfFunctions.c +++ b/src/NormInfFunctions.c @@ -58,22 +58,22 @@ int LocalReduce_NormInf_BYTE(int i, int weight_on, const void * const weight, CC 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; @@ -81,17 +81,17 @@ int LocalReduce_NormInf_BYTE(int i, int weight_on, const void * const weight, CC 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; @@ -152,7 +152,7 @@ int LocalReduce_NormInf_BYTE(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 @@ -181,7 +181,8 @@ int LocalReduce_NormInf_BYTE(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -208,7 +209,7 @@ int LocalReduce_NormInf_BYTE(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 @@ -237,7 +238,8 @@ int LocalReduce_NormInf_BYTE(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -265,7 +267,7 @@ int LocalReduce_NormInf_BYTE(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 @@ -294,7 +296,8 @@ int LocalReduce_NormInf_BYTE(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -367,22 +370,22 @@ int LocalReduce_NormInf_INT(int i, int weight_on, const void * const weight, CCT 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; @@ -390,17 +393,17 @@ int LocalReduce_NormInf_INT(int i, int weight_on, const void * const weight, CCT 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; @@ -460,7 +463,7 @@ int LocalReduce_NormInf_INT(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 @@ -489,7 +492,8 @@ int LocalReduce_NormInf_INT(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -516,7 +520,7 @@ int LocalReduce_NormInf_INT(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 @@ -545,7 +549,8 @@ int LocalReduce_NormInf_INT(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -572,7 +577,7 @@ int LocalReduce_NormInf_INT(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 @@ -601,7 +606,8 @@ int LocalReduce_NormInf_INT(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -633,7 +639,7 @@ int LocalReduce_NormInf_INT(int i, int weight_on, const void * const weight, CCT return 0; } -#ifdef CCTK_INT1 +#ifdef HAVE_CCTK_INT1 int LocalReduce_NormInf_INT1(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; @@ -674,22 +680,22 @@ int LocalReduce_NormInf_INT1(int i, int weight_on, const void * const weight, CC 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; @@ -697,17 +703,17 @@ int LocalReduce_NormInf_INT1(int i, int weight_on, const void * const weight, CC 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; @@ -767,7 +773,7 @@ int LocalReduce_NormInf_INT1(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 @@ -796,7 +802,8 @@ int LocalReduce_NormInf_INT1(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -823,7 +830,7 @@ int LocalReduce_NormInf_INT1(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 @@ -852,7 +859,8 @@ int LocalReduce_NormInf_INT1(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -880,7 +888,7 @@ int LocalReduce_NormInf_INT1(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 @@ -909,7 +917,8 @@ int LocalReduce_NormInf_INT1(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -943,7 +952,7 @@ int LocalReduce_NormInf_INT1(int i, int weight_on, const void * const weight, CC } #endif -#ifdef CCTK_INT2 +#ifdef HAVE_CCTK_INT2 int LocalReduce_NormInf_INT2(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; @@ -984,22 +993,22 @@ int LocalReduce_NormInf_INT2(int i, int weight_on, const void * const weight, CC 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; @@ -1007,17 +1016,17 @@ int LocalReduce_NormInf_INT2(int i, int weight_on, const void * const weight, CC 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; @@ -1077,7 +1086,7 @@ int LocalReduce_NormInf_INT2(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 @@ -1106,7 +1115,8 @@ int LocalReduce_NormInf_INT2(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -1133,7 +1143,7 @@ int LocalReduce_NormInf_INT2(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 @@ -1162,7 +1172,8 @@ int LocalReduce_NormInf_INT2(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1190,7 +1201,7 @@ int LocalReduce_NormInf_INT2(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 @@ -1219,7 +1230,8 @@ int LocalReduce_NormInf_INT2(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1253,7 +1265,7 @@ int LocalReduce_NormInf_INT2(int i, int weight_on, const void * const weight, CC } #endif -#ifdef CCTK_INT4 +#ifdef HAVE_CCTK_INT4 int LocalReduce_NormInf_INT4(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; @@ -1294,22 +1306,22 @@ int LocalReduce_NormInf_INT4(int i, int weight_on, const void * const weight, CC 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; @@ -1317,17 +1329,17 @@ int LocalReduce_NormInf_INT4(int i, int weight_on, const void * const weight, CC 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; @@ -1387,7 +1399,7 @@ int LocalReduce_NormInf_INT4(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 @@ -1416,7 +1428,8 @@ int LocalReduce_NormInf_INT4(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -1443,7 +1456,7 @@ int LocalReduce_NormInf_INT4(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 @@ -1472,7 +1485,8 @@ int LocalReduce_NormInf_INT4(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1500,7 +1514,7 @@ int LocalReduce_NormInf_INT4(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 @@ -1529,7 +1543,8 @@ int LocalReduce_NormInf_INT4(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1563,7 +1578,7 @@ int LocalReduce_NormInf_INT4(int i, int weight_on, const void * const weight, CC } #endif -#ifdef CCTK_INT8 +#ifdef HAVE_CCTK_INT8 int LocalReduce_NormInf_INT8(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; @@ -1604,22 +1619,22 @@ int LocalReduce_NormInf_INT8(int i, int weight_on, const void * const weight, CC 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; @@ -1627,17 +1642,17 @@ int LocalReduce_NormInf_INT8(int i, int weight_on, const void * const weight, CC 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; @@ -1697,7 +1712,7 @@ int LocalReduce_NormInf_INT8(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 @@ -1726,7 +1741,8 @@ int LocalReduce_NormInf_INT8(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -1753,7 +1769,7 @@ int LocalReduce_NormInf_INT8(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 @@ -1782,7 +1798,8 @@ int LocalReduce_NormInf_INT8(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1810,7 +1827,7 @@ int LocalReduce_NormInf_INT8(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 @@ -1839,7 +1856,8 @@ int LocalReduce_NormInf_INT8(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -1913,22 +1931,22 @@ int LocalReduce_NormInf_REAL(int i, int weight_on, const void * const weight, CC 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; @@ -1936,17 +1954,17 @@ int LocalReduce_NormInf_REAL(int i, int weight_on, const void * const weight, CC 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; @@ -2006,7 +2024,7 @@ int LocalReduce_NormInf_REAL(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 @@ -2035,7 +2053,8 @@ int LocalReduce_NormInf_REAL(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -2062,7 +2081,7 @@ int LocalReduce_NormInf_REAL(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 @@ -2091,7 +2110,8 @@ int LocalReduce_NormInf_REAL(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2119,7 +2139,7 @@ int LocalReduce_NormInf_REAL(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 @@ -2148,7 +2168,8 @@ int LocalReduce_NormInf_REAL(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2181,7 +2202,7 @@ int LocalReduce_NormInf_REAL(int i, int weight_on, const void * const weight, CC return 0; } -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 int LocalReduce_NormInf_REAL4(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; @@ -2222,22 +2243,22 @@ int LocalReduce_NormInf_REAL4(int i, int weight_on, const void * const weight, C 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; @@ -2245,17 +2266,17 @@ int LocalReduce_NormInf_REAL4(int i, int weight_on, const void * const weight, C 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; @@ -2315,7 +2336,7 @@ int LocalReduce_NormInf_REAL4(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 @@ -2344,7 +2365,8 @@ int LocalReduce_NormInf_REAL4(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -2371,7 +2393,7 @@ int LocalReduce_NormInf_REAL4(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 @@ -2400,7 +2422,8 @@ int LocalReduce_NormInf_REAL4(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2428,7 +2451,7 @@ int LocalReduce_NormInf_REAL4(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 @@ -2457,7 +2480,8 @@ int LocalReduce_NormInf_REAL4(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2491,7 +2515,7 @@ int LocalReduce_NormInf_REAL4(int i, int weight_on, const void * const weight, C } #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 int LocalReduce_NormInf_REAL8(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; @@ -2532,22 +2556,22 @@ int LocalReduce_NormInf_REAL8(int i, int weight_on, const void * const weight, C 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; @@ -2555,17 +2579,17 @@ int LocalReduce_NormInf_REAL8(int i, int weight_on, const void * const weight, C 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; @@ -2625,7 +2649,7 @@ int LocalReduce_NormInf_REAL8(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 @@ -2654,7 +2678,8 @@ int LocalReduce_NormInf_REAL8(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -2681,7 +2706,7 @@ int LocalReduce_NormInf_REAL8(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 @@ -2710,7 +2735,8 @@ int LocalReduce_NormInf_REAL8(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2738,7 +2764,7 @@ int LocalReduce_NormInf_REAL8(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 @@ -2767,7 +2793,8 @@ int LocalReduce_NormInf_REAL8(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]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -2802,7 +2829,7 @@ int LocalReduce_NormInf_REAL8(int i, int weight_on, const void * const weight, C } #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 int LocalReduce_NormInf_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; @@ -2843,22 +2870,22 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, 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; @@ -2866,17 +2893,17 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, 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; @@ -2936,7 +2963,7 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -2965,7 +2992,8 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #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) @@ -2992,7 +3020,7 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3021,7 +3049,8 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -3049,7 +3078,7 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3078,7 +3107,8 @@ int LocalReduce_NormInf_REAL16(int i, int weight_on, const void * const weight, #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval.Re = (CCTK_REAL16) typed_vdata[sum_indices]; #endif -#define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX( (NormInf).Re, ABS((scalar).Re)); +#define REDUCTION_OPERATION(NormInf, scalar) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re)); +#define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) (NormInf).Re = MAX( (NormInf).Re, ABS((scalar).Re*weight)); #define REDUCTION_INITIAL(num) (num).Re = 0.0; (num).Im = 0.0; #define EXTRA_STEP(a, b) @@ -3155,22 +3185,22 @@ int LocalReduce_NormInf_COMPLEX(int i, int weight_on, const void * const weight, 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; @@ -3178,17 +3208,17 @@ int LocalReduce_NormInf_COMPLEX(int i, int weight_on, const void * const weight, 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; @@ -3241,7 +3271,7 @@ int LocalReduce_NormInf_COMPLEX(int i, int weight_on, const void * const weight, #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3291,7 +3321,7 @@ int LocalReduce_NormInf_COMPLEX(int i, int weight_on, const void * const weight, break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3342,7 +3372,7 @@ int LocalReduce_NormInf_COMPLEX(int i, int weight_on, const void * const weight, break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3399,7 +3429,7 @@ int LocalReduce_NormInf_COMPLEX(int i, int weight_on, const void * const weight, } -#ifdef CCTK_COMPLEX8 +#ifdef HAVE_CCTK_COMPLEX8 int LocalReduce_NormInf_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; @@ -3415,19 +3445,9 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight #undef REDUCTION_INITIAL #undef EXTRA_STEP -#ifdef CCTK_REAL_PRECISION_4 #undef REDUCTION_PREOP_CAST #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval = (CCTK_REAL4) (CCTK_Cmplx8Abs(typed_vdata[sum_indices])); -#elif CCTK_REAL_PRECISION_8 -#undef REDUCTION_PREOP_CAST -#define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ - inval = (CCTK_REAL8) (CCTK_Cmplx16Abs(typed_vdata[sum_indices])); -#elif CCTK_REAL_PRECISION_16 -#undef REDUCTION_PREOP_CAST -#define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ - inval = (CCTK_REAL16) (CCTK_Cmplx32Abs(typed_vdata[sum_indices])); -#endif #define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX(NormInf , ABS(scalar)); #define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) NormInf = MAX(NormInf , ABS(scalar*weight)); @@ -3443,22 +3463,22 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight 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; @@ -3466,17 +3486,17 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight 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; @@ -3509,19 +3529,9 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight #undef REDUCTION_INITIAL #undef EXTRA_STEP -#ifdef CCTK_REAL_PRECISION_4 #undef REDUCTION_PREOP_CAST #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval = (CCTK_REAL4) (CCTK_Cmplx8Abs(typed_vdata[sum_indices])); -#elif CCTK_REAL_PRECISION_8 -#undef REDUCTION_PREOP_CAST -#define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ - inval = (CCTK_REAL8) (CCTK_Cmplx16Abs(typed_vdata[sum_indices])); -#elif CCTK_REAL_PRECISION_16 -#undef REDUCTION_PREOP_CAST -#define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ - inval = (CCTK_REAL16) (CCTK_Cmplx32Abs(typed_vdata[sum_indices])); -#endif #define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX(NormInf , ABS(scalar)); #define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) NormInf = MAX(NormInf , ABS(scalar*weight)); @@ -3529,7 +3539,7 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3579,7 +3589,7 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3630,7 +3640,7 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3687,7 +3697,7 @@ int LocalReduce_NormInf_COMPLEX8(int i, int weight_on, const void * const weight } #endif -#ifdef CCTK_COMPLEX16 +#ifdef HAVE_CCTK_COMPLEX16 int LocalReduce_NormInf_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; @@ -3731,22 +3741,22 @@ int LocalReduce_NormInf_COMPLEX16(int i, int weight_on, const void * const weigh 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; @@ -3754,17 +3764,17 @@ int LocalReduce_NormInf_COMPLEX16(int i, int weight_on, const void * const weigh 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; @@ -3817,7 +3827,7 @@ int LocalReduce_NormInf_COMPLEX16(int i, int weight_on, const void * const weigh #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3867,7 +3877,7 @@ int LocalReduce_NormInf_COMPLEX16(int i, int weight_on, const void * const weigh break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3918,7 +3928,7 @@ int LocalReduce_NormInf_COMPLEX16(int i, int weight_on, const void * const weigh break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -3975,7 +3985,7 @@ int LocalReduce_NormInf_COMPLEX16(int i, int weight_on, const void * const weigh } #endif -#ifdef CCTK_COMPLEX32 +#ifdef HAVE_CCTK_COMPLEX32 int LocalReduce_NormInf_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; @@ -3991,19 +4001,9 @@ int LocalReduce_NormInf_COMPLEX32(int i, int weight_on, const void * const weigh #undef REDUCTION_INITIAL #undef EXTRA_STEP -#ifdef CCTK_REAL_PRECISION_4 -#undef REDUCTION_PREOP_CAST -#define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ - inval = (CCTK_REAL4) (CCTK_Cmplx8Abs(typed_vdata[sum_indices])); -#elif CCTK_REAL_PRECISION_8 -#undef REDUCTION_PREOP_CAST -#define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ - inval = (CCTK_REAL8) (CCTK_Cmplx16Abs(typed_vdata[sum_indices])); -#elif CCTK_REAL_PRECISION_16 #undef REDUCTION_PREOP_CAST #define REDUCTION_PREOP_CAST(inval, typed_vdata,sum_indices, out_type) \ inval = (CCTK_REAL16) (CCTK_Cmplx32Abs(typed_vdata[sum_indices])); -#endif #define REDUCTION_OPERATION(NormInf, scalar) NormInf = MAX(NormInf , ABS(scalar)); #define WEIGHTED_REDUCTION_OPERATION(NormInf, scalar, weight) NormInf = MAX(NormInf , ABS(scalar*weight)); @@ -4014,27 +4014,27 @@ int LocalReduce_NormInf_COMPLEX32(int i, int weight_on, const void * const weigh { /* 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; @@ -4042,17 +4042,17 @@ int LocalReduce_NormInf_COMPLEX32(int i, int weight_on, const void * const weigh 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; @@ -4105,7 +4105,7 @@ int LocalReduce_NormInf_COMPLEX32(int i, int weight_on, const void * const weigh #define EXTRA_STEP(a, b) break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -4155,7 +4155,7 @@ int LocalReduce_NormInf_COMPLEX32(int i, int weight_on, const void * const weigh break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION @@ -4206,7 +4206,7 @@ int LocalReduce_NormInf_COMPLEX32(int i, int weight_on, const void * const weigh break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: #undef REDUCTION_OPERATION #undef WEIGHTED_REDUCTION_OPERATION |