From 93e8ac65c3271efb8e72e2bbf1d7cab013d20b11 Mon Sep 17 00:00:00 2001 From: yye00 Date: Thu, 26 Aug 2004 16:58:06 +0000 Subject: more warning fixes git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@30 7daa882c-dc44-4453-834e-278d26b18e6a --- src/ReductionNorm1.c | 37 ++++++++++++++++++++++++++++++++++++- src/ReductionNorm3.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c index 93b2bd5..dc7540c 100644 --- a/src/ReductionNorm1.c +++ b/src/ReductionNorm1.c @@ -245,7 +245,6 @@ static int ReductionL1 (int N_dims, int operator_handle, #undef ABS #endif #define ABS(x) ((x) < 0 ? -(x) : (x)) - #define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); #define REDUCTION_INITIAL(num) num = 0; #define EXTRA_STEP(a, b) @@ -261,7 +260,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT, 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,product) @@ -329,7 +332,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT, 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,product) @@ -396,9 +403,13 @@ static int ReductionL1 (int N_dims, int operator_handle, case CCTK_VARIABLE_INT1: switch (output_number_type_codes[i]) { +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; /* out values type switches*/ case CCTK_VARIABLE_CHAR: 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT, 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,product) @@ -468,7 +479,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT, 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,product) @@ -538,7 +553,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT, 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,product) @@ -608,7 +627,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT, 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,product) @@ -677,7 +700,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT, 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,product) @@ -746,7 +773,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT, 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,product) @@ -816,7 +847,11 @@ static int ReductionL1 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT, 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,product) diff --git a/src/ReductionNorm3.c b/src/ReductionNorm3.c index 768d470..e94cfa6 100644 --- a/src/ReductionNorm3.c +++ b/src/ReductionNorm3.c @@ -243,7 +243,7 @@ static int ReductionL3 (int N_dims, int operator_handle, #define CUBE_ABS(x) ((x) < 0 ? -((x) * (x) * (x)) : (x) * (x) * (x)) -#define REDUCTION_OPERATION(Norm3, scalar) Norm3 += CUBE_ABS (scalar) +#define REDUCTION_OPERATION(Norm3, scalar) Norm3 += CUBE_CUBE_ABS (scalar) #define REDUCTION_INITIAL(num) num = 0; #define EXTRA_STEP(a, b) @@ -258,7 +258,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_INT, 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,product) @@ -326,7 +330,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_INT, 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,product) @@ -393,9 +401,13 @@ static int ReductionL3 (int N_dims, int operator_handle, case CCTK_VARIABLE_INT1: switch (output_number_type_codes[i]) { +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; /* out values type switches*/ case CCTK_VARIABLE_CHAR: 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_INT, 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,product) @@ -465,7 +477,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_INT, 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,product) @@ -535,7 +551,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_INT, 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,product) @@ -605,7 +625,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_INT, 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,product) @@ -674,7 +698,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_INT, 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,product) @@ -743,7 +771,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_INT, 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,product) @@ -813,7 +845,11 @@ static int ReductionL3 (int N_dims, int operator_handle, { /* out values type switches*/ case CCTK_VARIABLE_CHAR: +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + scalar; 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,product) +#undef REDUCTION_OPERATION +#define REDUCTION_OPERATION(Norm1, scalar) Norm1 = Norm1 + CUBE_ABS(scalar); break; case CCTK_VARIABLE_INT: ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_INT, 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,product) @@ -949,8 +985,7 @@ static int ReductionL3 (int N_dims, int operator_handle, #endif case CCTK_VARIABLE_COMPLEX: #undef REDUCTION_OPERATION -#define REDUCTION_OPERATION(norm3, scalar) norm3 += CUBE_ABS ((scalar).Re) +\ - CUBE_ABS ((scalar).Im) +#define REDUCTION_OPERATION(norm1, scalar) norm1 = norm1 + CCTK_CmplxAbs (scalar) switch (output_number_type_codes[i]) { /* out values type switches*/ -- cgit v1.2.3