diff options
author | yye00 <yye00@7daa882c-dc44-4453-834e-278d26b18e6a> | 2004-08-29 09:20:01 +0000 |
---|---|---|
committer | yye00 <yye00@7daa882c-dc44-4453-834e-278d26b18e6a> | 2004-08-29 09:20:01 +0000 |
commit | 061727bed2d8036e2d69a332d57d87f50a25737e (patch) | |
tree | e015c1e4e4d03f2e287ce16568d99e57a2412bc2 /src/ReductionNorm1.c | |
parent | c1c50ea29ff0cb0d21ac8b048a8bf76317d12fb2 (diff) |
most minor fixes and indentation stuff
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@32 7daa882c-dc44-4453-834e-278d26b18e6a
Diffstat (limited to 'src/ReductionNorm1.c')
-rw-r--r-- | src/ReductionNorm1.c | 112 |
1 files changed, 60 insertions, 52 deletions
diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c index dc7540c..8a83859 100644 --- a/src/ReductionNorm1.c +++ b/src/ReductionNorm1.c @@ -194,14 +194,14 @@ static int ReductionL1 (int N_dims, int operator_handle, /* for strides and subscripts get values from param table (it they exist) */ if ( Util_TableQueryNKeys(param_table_handle) != 0) { - ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, - N_input_arrays, input_array_offsets, "input_array_offsets"); - ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, - N_dims, input_array_strides, "input_array_strides"); - ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, - N_dims, input_array_min_subscripts, "input_array_min_subscripts"); - ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, - N_dims, input_array_min_subscripts, "input_array_min_subscripts"); + ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, + N_input_arrays, input_array_offsets, "input_array_offsets"); + ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, + N_dims, input_array_strides, "input_array_strides"); + ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, + N_dims, input_array_min_subscripts, "input_array_min_subscripts"); + ierr = Util_TableGetGenericArray(param_table_handle, CCTK_VARIABLE_INT, + N_dims, input_array_max_subscripts, "input_array_max_subscripts"); } /* for masks get values from param table (it they exist) */ @@ -302,9 +302,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_BYTE, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -374,9 +374,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_INT, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -447,9 +447,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_INT1, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -521,9 +521,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_INT2, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -595,9 +595,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_INT4, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -669,9 +669,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_INT8, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -742,9 +742,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_REAL, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -815,9 +815,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_REAL4, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -889,9 +889,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_REAL8, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -915,8 +915,8 @@ static int ReductionL1 (int N_dims, int operator_handle, } break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: switch (output_number_type_codes[i]) { /* out values type switches*/ @@ -959,9 +959,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_REAL16, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -1030,9 +1030,9 @@ static int ReductionL1 (int N_dims, int operator_handle, /* ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL8, 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)*/ break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: -/* ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL6, 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)*/ + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: +/* ITERATE_ON_ARRAY(i,CCTK_COMPLEX, input_arrays[i], CCTK_REAL16, 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)*/ break; #endif case CCTK_VARIABLE_COMPLEX: @@ -1099,9 +1099,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_COMPLEX8, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -1169,9 +1169,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_COMPLEX16, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -1239,9 +1239,9 @@ static int ReductionL1 (int N_dims, int operator_handle, ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL8, 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) break; #endif - #ifdef CCTK_REAL6 - case CCTK_VARIABLE_REAL6: - ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL6, 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) + #ifdef CCTK_REAL16 + case CCTK_VARIABLE_REAL16: + ITERATE_ON_ARRAY(i,CCTK_COMPLEX32, input_arrays[i], CCTK_REAL16, 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) break; #endif case CCTK_VARIABLE_COMPLEX: @@ -1268,6 +1268,14 @@ static int ReductionL1 (int N_dims, int operator_handle, } } + /* store the number of points in the paramater table */ + if ( Util_TableQueryNKeys(param_table_handle) != 0) + { + ierr = Util_TableSetInt(param_table_handle, num_points, "num_points"); + ierr = Util_TableSetInt(param_table_handle, 3,"mpi_operation"); + ierr = Util_TableSetInt(param_table_handle, 0,"perform_division"); + } + /* free memory */ free (iters_per_dim); free (indices); |