From 93ebe571a16f2eefc65639ea94c87924d40dfd41 Mon Sep 17 00:00:00 2001 From: schnetter Date: Sat, 29 Jan 2005 17:45:52 +0000 Subject: Use CCTK_BYTE instead of CCTK_CHAR. git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@56 7daa882c-dc44-4453-834e-278d26b18e6a --- src/AvgFunctions.c | 30 +++++++++++++++--------------- src/Avg_Functions.h | 2 +- src/CountFunctions.c | 30 +++++++++++++++--------------- src/Count_Functions.h | 2 +- src/MaxFunctions.c | 30 +++++++++++++++--------------- src/Max_Functions.h | 2 +- src/MinFunctions.c | 30 +++++++++++++++--------------- src/Min_Functions.h | 2 +- src/Norm1Functions.c | 30 +++++++++++++++--------------- src/Norm1_Functions.h | 2 +- src/Norm2Functions.c | 30 +++++++++++++++--------------- src/Norm2_Functions.h | 2 +- src/Norm3Functions.c | 30 +++++++++++++++--------------- src/Norm3_Functions.h | 2 +- src/Norm4Functions.c | 30 +++++++++++++++--------------- src/Norm4_Functions.h | 2 +- src/NormInfFunctions.c | 30 +++++++++++++++--------------- src/NormInf_Functions.h | 2 +- src/ReductionAvg.c | 10 +++++----- src/ReductionCount.c | 4 ++-- src/ReductionMax.c | 4 ++-- src/ReductionMin.c | 4 ++-- src/ReductionNorm1.c | 8 ++++---- src/ReductionNorm2.c | 13 +++++++------ src/ReductionNorm3.c | 11 ++++++----- src/ReductionNorm4.c | 11 ++++++----- src/ReductionNormInf.c | 10 +++++----- src/ReductionSum.c | 4 ++-- src/SumFunctions.c | 30 +++++++++++++++--------------- src/Sum_Functions.h | 2 +- 30 files changed, 201 insertions(+), 198 deletions(-) diff --git a/src/AvgFunctions.c b/src/AvgFunctions.c index 428598d..dd0a42a 100644 --- a/src/AvgFunctions.c +++ b/src/AvgFunctions.c @@ -19,7 +19,7 @@ extern "C" { -int LocalReduce_Avg_CHAR(int i, int mask_on, 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 LocalReduce_Avg_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -39,7 +39,7 @@ int LocalReduce_Avg_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -255,7 +255,7 @@ int LocalReduce_Avg_INT(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -469,7 +469,7 @@ int LocalReduce_Avg_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -686,7 +686,7 @@ int LocalReduce_Avg_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -903,7 +903,7 @@ int LocalReduce_Avg_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1120,7 +1120,7 @@ int LocalReduce_Avg_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1336,7 +1336,7 @@ int LocalReduce_Avg_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1552,7 +1552,7 @@ int LocalReduce_Avg_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1769,7 +1769,7 @@ int LocalReduce_Avg_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1987,7 +1987,7 @@ int LocalReduce_Avg_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2214,7 +2214,7 @@ int LocalReduce_Avg_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2446,7 +2446,7 @@ int LocalReduce_Avg_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2678,7 +2678,7 @@ int LocalReduce_Avg_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2910,7 +2910,7 @@ int LocalReduce_Avg_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Avg_Functions.h b/src/Avg_Functions.h index eece300..8f91883 100644 --- a/src/Avg_Functions.h +++ b/src/Avg_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Avg reduction functions */ -int LocalReduce_Avg_CHAR(int i, int mask_on, 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 LocalReduce_Avg_BYTE(int i, int mask_on, 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 LocalReduce_Avg_INT(int i, int mask_on, 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[]); diff --git a/src/CountFunctions.c b/src/CountFunctions.c index a86f057..a0e9f91 100644 --- a/src/CountFunctions.c +++ b/src/CountFunctions.c @@ -17,7 +17,7 @@ extern "C" { #endif -int LocalReduce_Count_CHAR(int i, int mask_on, 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 LocalReduce_Count_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -37,7 +37,7 @@ int LocalReduce_Count_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -253,7 +253,7 @@ int LocalReduce_Count_INT(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -467,7 +467,7 @@ int LocalReduce_Count_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -684,7 +684,7 @@ int LocalReduce_Count_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -901,7 +901,7 @@ int LocalReduce_Count_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1118,7 +1118,7 @@ int LocalReduce_Count_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1334,7 +1334,7 @@ int LocalReduce_Count_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1550,7 +1550,7 @@ int LocalReduce_Count_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1767,7 +1767,7 @@ int LocalReduce_Count_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1985,7 +1985,7 @@ int LocalReduce_Count_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2212,7 +2212,7 @@ int LocalReduce_Count_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2444,7 +2444,7 @@ int LocalReduce_Count_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offset switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2676,7 +2676,7 @@ int LocalReduce_Count_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2908,7 +2908,7 @@ int LocalReduce_Count_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Count_Functions.h b/src/Count_Functions.h index 452ceb5..d760020 100644 --- a/src/Count_Functions.h +++ b/src/Count_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Count reduction functions */ -int LocalReduce_Count_CHAR(int i, int mask_on, 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 LocalReduce_Count_BYTE(int i, int mask_on, 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 LocalReduce_Count_INT(int i, int mask_on, 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[]); diff --git a/src/MaxFunctions.c b/src/MaxFunctions.c index 69446c9..e6a9464 100644 --- a/src/MaxFunctions.c +++ b/src/MaxFunctions.c @@ -18,7 +18,7 @@ extern "C" { #endif -int LocalReduce_Max_CHAR(int i, int mask_on, 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 LocalReduce_Max_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -38,7 +38,7 @@ int LocalReduce_Max_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -254,7 +254,7 @@ int LocalReduce_Max_INT(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -468,7 +468,7 @@ int LocalReduce_Max_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -685,7 +685,7 @@ int LocalReduce_Max_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -902,7 +902,7 @@ int LocalReduce_Max_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1119,7 +1119,7 @@ int LocalReduce_Max_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1335,7 +1335,7 @@ int LocalReduce_Max_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1551,7 +1551,7 @@ int LocalReduce_Max_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1768,7 +1768,7 @@ int LocalReduce_Max_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1986,7 +1986,7 @@ int LocalReduce_Max_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2213,7 +2213,7 @@ int LocalReduce_Max_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2445,7 +2445,7 @@ int LocalReduce_Max_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2677,7 +2677,7 @@ int LocalReduce_Max_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2909,7 +2909,7 @@ int LocalReduce_Max_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Max_Functions.h b/src/Max_Functions.h index c6d2cbd..ca2ab3f 100644 --- a/src/Max_Functions.h +++ b/src/Max_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Max reduction functions */ -int LocalReduce_Max_CHAR(int i, int mask_on, 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 LocalReduce_Max_BYTE(int i, int mask_on, 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 LocalReduce_Max_INT(int i, int mask_on, 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[]); diff --git a/src/MinFunctions.c b/src/MinFunctions.c index 9d77a3f..41f13ce 100644 --- a/src/MinFunctions.c +++ b/src/MinFunctions.c @@ -17,7 +17,7 @@ extern "C" { #endif -int LocalReduce_Min_CHAR(int i, int mask_on, 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 LocalReduce_Min_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -37,7 +37,7 @@ int LocalReduce_Min_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -253,7 +253,7 @@ int LocalReduce_Min_INT(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -467,7 +467,7 @@ int LocalReduce_Min_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -684,7 +684,7 @@ int LocalReduce_Min_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -901,7 +901,7 @@ int LocalReduce_Min_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1118,7 +1118,7 @@ int LocalReduce_Min_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1334,7 +1334,7 @@ int LocalReduce_Min_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1550,7 +1550,7 @@ int LocalReduce_Min_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1767,7 +1767,7 @@ int LocalReduce_Min_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1985,7 +1985,7 @@ int LocalReduce_Min_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2212,7 +2212,7 @@ int LocalReduce_Min_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2444,7 +2444,7 @@ int LocalReduce_Min_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2676,7 +2676,7 @@ int LocalReduce_Min_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2908,7 +2908,7 @@ int LocalReduce_Min_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Min_Functions.h b/src/Min_Functions.h index 43f3483..62fad17 100644 --- a/src/Min_Functions.h +++ b/src/Min_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Min reduction functions */ -int LocalReduce_Min_CHAR(int i, int mask_on, 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 LocalReduce_Min_BYTE(int i, int mask_on, 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 LocalReduce_Min_INT(int i, int mask_on, 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[]); diff --git a/src/Norm1Functions.c b/src/Norm1Functions.c index 0fe5e7e..e8ccef3 100644 --- a/src/Norm1Functions.c +++ b/src/Norm1Functions.c @@ -18,7 +18,7 @@ extern "C" { #endif -int LocalReduce_Norm1_CHAR(int i, int mask_on, 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 LocalReduce_Norm1_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -42,7 +42,7 @@ int LocalReduce_Norm1_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -294,7 +294,7 @@ int LocalReduce_Norm1_INT(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -544,7 +544,7 @@ int LocalReduce_Norm1_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -797,7 +797,7 @@ int LocalReduce_Norm1_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1050,7 +1050,7 @@ int LocalReduce_Norm1_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1303,7 +1303,7 @@ int LocalReduce_Norm1_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1555,7 +1555,7 @@ int LocalReduce_Norm1_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1807,7 +1807,7 @@ int LocalReduce_Norm1_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2060,7 +2060,7 @@ int LocalReduce_Norm1_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2314,7 +2314,7 @@ int LocalReduce_Norm1_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2573,7 +2573,7 @@ int LocalReduce_Norm1_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2821,7 +2821,7 @@ int LocalReduce_Norm1_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offset switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3069,7 +3069,7 @@ int LocalReduce_Norm1_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3317,7 +3317,7 @@ int LocalReduce_Norm1_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Norm1_Functions.h b/src/Norm1_Functions.h index 54bd8e4..0ddbcee 100644 --- a/src/Norm1_Functions.h +++ b/src/Norm1_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Norm1 reduction functions */ -int LocalReduce_Norm1_CHAR(int i, int mask_on, 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 LocalReduce_Norm1_BYTE(int i, int mask_on, 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 LocalReduce_Norm1_INT(int i, int mask_on, 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[]); diff --git a/src/Norm2Functions.c b/src/Norm2Functions.c index e544d18..f5bc8b4 100644 --- a/src/Norm2Functions.c +++ b/src/Norm2Functions.c @@ -18,7 +18,7 @@ extern "C" { #endif -int LocalReduce_Norm2_CHAR(int i, int mask_on, 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 LocalReduce_Norm2_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -42,7 +42,7 @@ int LocalReduce_Norm2_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -294,7 +294,7 @@ int LocalReduce_Norm2_INT(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -544,7 +544,7 @@ int LocalReduce_Norm2_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -797,7 +797,7 @@ int LocalReduce_Norm2_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1050,7 +1050,7 @@ int LocalReduce_Norm2_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1303,7 +1303,7 @@ int LocalReduce_Norm2_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1555,7 +1555,7 @@ int LocalReduce_Norm2_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1807,7 +1807,7 @@ int LocalReduce_Norm2_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2060,7 +2060,7 @@ int LocalReduce_Norm2_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2314,7 +2314,7 @@ int LocalReduce_Norm2_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2577,7 +2577,7 @@ int LocalReduce_Norm2_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2845,7 +2845,7 @@ int LocalReduce_Norm2_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offset switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3113,7 +3113,7 @@ int LocalReduce_Norm2_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3381,7 +3381,7 @@ int LocalReduce_Norm2_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Norm2_Functions.h b/src/Norm2_Functions.h index 7e4c33c..c4da8f6 100644 --- a/src/Norm2_Functions.h +++ b/src/Norm2_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Norm2 reduction functions */ -int LocalReduce_Norm2_CHAR(int i, int mask_on, 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 LocalReduce_Norm2_BYTE(int i, int mask_on, 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 LocalReduce_Norm2_INT(int i, int mask_on, 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[]); diff --git a/src/Norm3Functions.c b/src/Norm3Functions.c index 9b34c7a..995307f 100644 --- a/src/Norm3Functions.c +++ b/src/Norm3Functions.c @@ -23,7 +23,7 @@ extern "C" { #define ABS(x) ((x) < 0 ? -(x) : (x)) -int LocalReduce_Norm3_CHAR(int i, int mask_on, 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 LocalReduce_Norm3_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -47,7 +47,7 @@ int LocalReduce_Norm3_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -299,7 +299,7 @@ int LocalReduce_Norm3_INT(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -549,7 +549,7 @@ int LocalReduce_Norm3_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -802,7 +802,7 @@ int LocalReduce_Norm3_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1055,7 +1055,7 @@ int LocalReduce_Norm3_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1308,7 +1308,7 @@ int LocalReduce_Norm3_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1560,7 +1560,7 @@ int LocalReduce_Norm3_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1812,7 +1812,7 @@ int LocalReduce_Norm3_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2065,7 +2065,7 @@ int LocalReduce_Norm3_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2319,7 +2319,7 @@ int LocalReduce_Norm3_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2582,7 +2582,7 @@ int LocalReduce_Norm3_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2850,7 +2850,7 @@ int LocalReduce_Norm3_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offset switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3118,7 +3118,7 @@ int LocalReduce_Norm3_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3386,7 +3386,7 @@ int LocalReduce_Norm3_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Norm3_Functions.h b/src/Norm3_Functions.h index 2501e1d..3b594c5 100644 --- a/src/Norm3_Functions.h +++ b/src/Norm3_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Norm3 reduction functions */ -int LocalReduce_Norm3_CHAR(int i, int mask_on, 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 LocalReduce_Norm3_BYTE(int i, int mask_on, 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 LocalReduce_Norm3_INT(int i, int mask_on, 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[]); diff --git a/src/Norm4Functions.c b/src/Norm4Functions.c index 469ecb2..f106642 100644 --- a/src/Norm4Functions.c +++ b/src/Norm4Functions.c @@ -18,7 +18,7 @@ extern "C" { #endif -int LocalReduce_Norm4_CHAR(int i, int mask_on, 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 LocalReduce_Norm4_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -42,7 +42,7 @@ int LocalReduce_Norm4_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -294,7 +294,7 @@ int LocalReduce_Norm4_INT(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -544,7 +544,7 @@ int LocalReduce_Norm4_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -797,7 +797,7 @@ int LocalReduce_Norm4_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1050,7 +1050,7 @@ int LocalReduce_Norm4_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1303,7 +1303,7 @@ int LocalReduce_Norm4_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1555,7 +1555,7 @@ int LocalReduce_Norm4_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1807,7 +1807,7 @@ int LocalReduce_Norm4_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2060,7 +2060,7 @@ int LocalReduce_Norm4_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2314,7 +2314,7 @@ int LocalReduce_Norm4_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2581,7 +2581,7 @@ int LocalReduce_Norm4_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2879,7 +2879,7 @@ int LocalReduce_Norm4_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offset switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3170,7 +3170,7 @@ int LocalReduce_Norm4_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3461,7 +3461,7 @@ int LocalReduce_Norm4_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Norm4_Functions.h b/src/Norm4_Functions.h index 930e18a..ebcde7c 100644 --- a/src/Norm4_Functions.h +++ b/src/Norm4_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Norm4 reduction functions */ -int LocalReduce_Norm4_CHAR(int i, int mask_on, 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 LocalReduce_Norm4_BYTE(int i, int mask_on, 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 LocalReduce_Norm4_INT(int i, int mask_on, 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[]); diff --git a/src/NormInfFunctions.c b/src/NormInfFunctions.c index 099dba0..96b7eda 100644 --- a/src/NormInfFunctions.c +++ b/src/NormInfFunctions.c @@ -18,7 +18,7 @@ extern "C" { #endif -int LocalReduce_NormInf_CHAR(int i, int mask_on, 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 LocalReduce_NormInf_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -46,7 +46,7 @@ int LocalReduce_NormInf_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -334,7 +334,7 @@ int LocalReduce_NormInf_INT(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -620,7 +620,7 @@ int LocalReduce_NormInf_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -909,7 +909,7 @@ int LocalReduce_NormInf_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1198,7 +1198,7 @@ int LocalReduce_NormInf_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1487,7 +1487,7 @@ int LocalReduce_NormInf_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1775,7 +1775,7 @@ int LocalReduce_NormInf_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2063,7 +2063,7 @@ int LocalReduce_NormInf_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2352,7 +2352,7 @@ int LocalReduce_NormInf_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2642,7 +2642,7 @@ int LocalReduce_NormInf_REAL16(int i, int mask_on, CCTK_INT * input_array_offset switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2933,7 +2933,7 @@ int LocalReduce_NormInf_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offse switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3197,7 +3197,7 @@ int LocalReduce_NormInf_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offs switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3461,7 +3461,7 @@ int LocalReduce_NormInf_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_off switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -3725,7 +3725,7 @@ int LocalReduce_NormInf_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_off switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/NormInf_Functions.h b/src/NormInf_Functions.h index 73ffa1d..17e9d6d 100644 --- a/src/NormInf_Functions.h +++ b/src/NormInf_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* NormInf reduction functions */ -int LocalReduce_NormInf_CHAR(int i, int mask_on, 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 LocalReduce_NormInf_BYTE(int i, int mask_on, 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 LocalReduce_NormInf_INT(int i, int mask_on, 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[]); diff --git a/src/ReductionAvg.c b/src/ReductionAvg.c index 0018e3b..fa9bd5e 100644 --- a/src/ReductionAvg.c +++ b/src/ReductionAvg.c @@ -35,7 +35,7 @@ static int ReductionAvg (int N_dims, int operator_handle, void * const output_numbers[]); /* Average (mean) reduction functions */ -int LocalReduce_Avg_CHAR(int i, int mask_on, 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 LocalReduce_Avg_BYTE(int i, int mask_on, 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 LocalReduce_Avg_INT(int i, int mask_on, 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[]); @@ -304,8 +304,8 @@ static int ReductionAvg (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Avg_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Avg_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Avg_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); @@ -387,8 +387,8 @@ static int ReductionAvg (int N_dims, int operator_handle, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: - *( (CCTK_CHAR *) output_numbers[i]) = *( (CCTK_CHAR *) output_numbers[i]) / num_points; + case CCTK_VARIABLE_BYTE: + *( (CCTK_BYTE *) output_numbers[i]) = *( (CCTK_BYTE *) output_numbers[i]) / num_points; break; case CCTK_VARIABLE_INT: *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; diff --git a/src/ReductionCount.c b/src/ReductionCount.c index 6df4a38..41f7689 100644 --- a/src/ReductionCount.c +++ b/src/ReductionCount.c @@ -254,8 +254,8 @@ static int ReductionCount (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Count_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Count_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Count_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); diff --git a/src/ReductionMax.c b/src/ReductionMax.c index 2862531..8eb333c 100644 --- a/src/ReductionMax.c +++ b/src/ReductionMax.c @@ -246,8 +246,8 @@ static int ReductionMax (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Max_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Max_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Max_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); diff --git a/src/ReductionMin.c b/src/ReductionMin.c index f96e7c1..f927e66 100644 --- a/src/ReductionMin.c +++ b/src/ReductionMin.c @@ -255,8 +255,8 @@ static int ReductionMin (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Min_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Min_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Min_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c index 59652e6..1b5eb3c 100644 --- a/src/ReductionNorm1.c +++ b/src/ReductionNorm1.c @@ -259,8 +259,8 @@ static int ReductionL1 (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Norm1_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Norm1_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Norm1_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); @@ -341,8 +341,8 @@ static int ReductionL1 (int N_dims, int operator_handle, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: - *( (CCTK_CHAR *) output_numbers[i]) = *( (CCTK_CHAR *) output_numbers[i]) / num_points; + case CCTK_VARIABLE_BYTE: + *( (CCTK_BYTE *) output_numbers[i]) = *( (CCTK_BYTE *) output_numbers[i]) / num_points; break; case CCTK_VARIABLE_INT: *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; diff --git a/src/ReductionNorm2.c b/src/ReductionNorm2.c index f04397f..09d1ad3 100644 --- a/src/ReductionNorm2.c +++ b/src/ReductionNorm2.c @@ -9,6 +9,7 @@ @version $Id$ @@*/ +#include #include #include @@ -272,8 +273,8 @@ static int ReductionL2 (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Norm2_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Norm2_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Norm2_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); @@ -355,9 +356,9 @@ static int ReductionL2 (int N_dims, int operator_handle, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: - *( (CCTK_CHAR *) output_numbers[i]) = *( (CCTK_CHAR *) output_numbers[i]) / num_points; - *( (CCTK_CHAR *) output_numbers[i]) = sqrt(*( (CCTK_CHAR *) output_numbers[i])); + case CCTK_VARIABLE_BYTE: + *( (CCTK_BYTE *) output_numbers[i]) = *( (CCTK_BYTE *) output_numbers[i]) / num_points; + *( (CCTK_BYTE *) output_numbers[i]) = sqrt(*( (CCTK_BYTE *) output_numbers[i])); break; case CCTK_VARIABLE_INT: *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; @@ -466,4 +467,4 @@ static int ReductionL2 (int N_dims, int operator_handle, free (input_array_max_subscripts); return (0); -} \ No newline at end of file +} diff --git a/src/ReductionNorm3.c b/src/ReductionNorm3.c index bb54b82..aea77bc 100644 --- a/src/ReductionNorm3.c +++ b/src/ReductionNorm3.c @@ -9,6 +9,7 @@ @version $Id$ @@*/ +#include #include #include @@ -269,8 +270,8 @@ static int ReductionL3 (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Norm3_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Norm3_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Norm3_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); @@ -352,9 +353,9 @@ static int ReductionL3 (int N_dims, int operator_handle, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: - *( (CCTK_CHAR *) output_numbers[i]) = *( (CCTK_CHAR *) output_numbers[i]) / num_points; - *( (CCTK_CHAR *) output_numbers[i]) = pow(*( (CCTK_CHAR *) output_numbers[i]), 1.0/3.0); + case CCTK_VARIABLE_BYTE: + *( (CCTK_BYTE *) output_numbers[i]) = *( (CCTK_BYTE *) output_numbers[i]) / num_points; + *( (CCTK_BYTE *) output_numbers[i]) = pow(*( (CCTK_BYTE *) output_numbers[i]), 1.0/3.0); break; case CCTK_VARIABLE_INT: *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; diff --git a/src/ReductionNorm4.c b/src/ReductionNorm4.c index 376ef3e..b72df97 100644 --- a/src/ReductionNorm4.c +++ b/src/ReductionNorm4.c @@ -9,6 +9,7 @@ @version $Id$ @@*/ +#include #include #include @@ -269,8 +270,8 @@ static int ReductionL4 (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Norm4_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Norm4_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Norm4_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); @@ -352,9 +353,9 @@ static int ReductionL4 (int N_dims, int operator_handle, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: - *( (CCTK_CHAR *) output_numbers[i]) = *( (CCTK_CHAR *) output_numbers[i]) / num_points; - *( (CCTK_CHAR *) output_numbers[i]) = pow(*( (CCTK_CHAR *) output_numbers[i]), 1.0/4.0); + case CCTK_VARIABLE_BYTE: + *( (CCTK_BYTE *) output_numbers[i]) = *( (CCTK_BYTE *) output_numbers[i]) / num_points; + *( (CCTK_BYTE *) output_numbers[i]) = pow(*( (CCTK_BYTE *) output_numbers[i]), 1.0/4.0); break; case CCTK_VARIABLE_INT: *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; diff --git a/src/ReductionNormInf.c b/src/ReductionNormInf.c index 21c2632..9b7d437 100644 --- a/src/ReductionNormInf.c +++ b/src/ReductionNormInf.c @@ -35,7 +35,7 @@ static int ReductionLInf (int N_dims, int operator_handle, void * const output_numbers[]); /* NormInf reduction functions */ -int LocalReduce_NormInf_CHAR(int i, int mask_on, 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 LocalReduce_NormInf_BYTE(int i, int mask_on, 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 LocalReduce_NormInf_INT(int i, int mask_on, 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[]); @@ -313,8 +313,8 @@ static int ReductionLInf (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_NormInf_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_NormInf_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_NormInf_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); @@ -395,8 +395,8 @@ static int ReductionLInf (int N_dims, int operator_handle, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: - *( (CCTK_CHAR *) output_numbers[i]) = *( (CCTK_CHAR *) output_numbers[i]) / num_points; + case CCTK_VARIABLE_BYTE: + *( (CCTK_BYTE *) output_numbers[i]) = *( (CCTK_BYTE *) output_numbers[i]) / num_points; break; case CCTK_VARIABLE_INT: *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; diff --git a/src/ReductionSum.c b/src/ReductionSum.c index 831e52b..480e855 100644 --- a/src/ReductionSum.c +++ b/src/ReductionSum.c @@ -256,8 +256,8 @@ static int ReductionSum (int N_dims, int operator_handle, switch (input_array_type_codes[i]) { /* in values type switches*/ - case CCTK_VARIABLE_CHAR: - num_points = LocalReduce_Sum_CHAR(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); + case CCTK_VARIABLE_BYTE: + num_points = LocalReduce_Sum_BYTE(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); break; case CCTK_VARIABLE_INT: num_points = LocalReduce_Sum_INT(i, mask_on, input_array_offsets, indices, max_iter, actual_indices, input_array_strides, input_array_min_subscripts, input_array_dims, num_points, actual_iters_per_dim, iters_per_dim, N_dims, input_arrays, output_number_type_codes, output_numbers); diff --git a/src/SumFunctions.c b/src/SumFunctions.c index b713dbd..401c5a0 100644 --- a/src/SumFunctions.c +++ b/src/SumFunctions.c @@ -18,7 +18,7 @@ extern "C" { #endif -int LocalReduce_Sum_CHAR(int i, int mask_on, 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 LocalReduce_Sum_BYTE(int i, int mask_on, 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 iter = 0; int sum_indices = 0; @@ -38,7 +38,7 @@ int LocalReduce_Sum_CHAR(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -254,7 +254,7 @@ int LocalReduce_Sum_INT(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -468,7 +468,7 @@ int LocalReduce_Sum_INT1(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -685,7 +685,7 @@ int LocalReduce_Sum_INT2(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -902,7 +902,7 @@ int LocalReduce_Sum_INT4(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1119,7 +1119,7 @@ int LocalReduce_Sum_INT8(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1335,7 +1335,7 @@ int LocalReduce_Sum_REAL(int i, int mask_on, CCTK_INT * input_array_offsets, int switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1551,7 +1551,7 @@ int LocalReduce_Sum_REAL4(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1768,7 +1768,7 @@ int LocalReduce_Sum_REAL8(int i, int mask_on, CCTK_INT * input_array_offsets, in switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -1986,7 +1986,7 @@ int LocalReduce_Sum_REAL16(int i, int mask_on, CCTK_INT * input_array_offsets, i switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2213,7 +2213,7 @@ int LocalReduce_Sum_COMPLEX(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2445,7 +2445,7 @@ int LocalReduce_Sum_COMPLEX8(int i, int mask_on, CCTK_INT * input_array_offsets, switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2677,7 +2677,7 @@ int LocalReduce_Sum_COMPLEX16(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_BYTE, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: @@ -2909,7 +2909,7 @@ int LocalReduce_Sum_COMPLEX32(int i, int mask_on, CCTK_INT * input_array_offsets switch (output_number_type_codes[i]) { /* out values type switches*/ - case CCTK_VARIABLE_CHAR: + case CCTK_VARIABLE_BYTE: ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_COMPLEX32, output_numbers[i], mask_on, input_array_offsets[i], indices, sum_indices, max_iter, iter, flag, actual_indices,input_array_strides, input_array_min_subscripts,input_array_dims,product) break; case CCTK_VARIABLE_INT: diff --git a/src/Sum_Functions.h b/src/Sum_Functions.h index 7419ecd..2a483bd 100644 --- a/src/Sum_Functions.h +++ b/src/Sum_Functions.h @@ -18,7 +18,7 @@ extern "C" { #endif /* Sum reduction functions */ -int LocalReduce_Sum_CHAR(int i, int mask_on, 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 LocalReduce_Sum_BYTE(int i, int mask_on, 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 LocalReduce_Sum_INT(int i, int mask_on, 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[]); -- cgit v1.2.3