diff options
author | yye00 <yye00@7daa882c-dc44-4453-834e-278d26b18e6a> | 2004-08-26 16:58:06 +0000 |
---|---|---|
committer | yye00 <yye00@7daa882c-dc44-4453-834e-278d26b18e6a> | 2004-08-26 16:58:06 +0000 |
commit | 93e8ac65c3271efb8e72e2bbf1d7cab013d20b11 (patch) | |
tree | c56c9a8ab292d0e3799a1d6302ca9ea33e1e311c /src/ReductionNorm1.c | |
parent | e9765897c6c65b42ae1cb093ab3a02b38243dd16 (diff) |
more warning fixes
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@30 7daa882c-dc44-4453-834e-278d26b18e6a
Diffstat (limited to 'src/ReductionNorm1.c')
-rw-r--r-- | src/ReductionNorm1.c | 37 |
1 files changed, 36 insertions, 1 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) |