diff options
author | yye00 <yye00@7daa882c-dc44-4453-834e-278d26b18e6a> | 2005-10-25 20:30:16 +0000 |
---|---|---|
committer | yye00 <yye00@7daa882c-dc44-4453-834e-278d26b18e6a> | 2005-10-25 20:30:16 +0000 |
commit | 6a6f2e17f2b8bd5e205a104526824972b945ce4c (patch) | |
tree | 392279dc8bb4c72dbf70b80c759a57f503b099d1 /src/ReductionNorm4.c | |
parent | 44fc50bcb487ee2406cc7e05595dc3bd3d56f485 (diff) |
This patch switches checking from #ifdef cctk_* to #ifdef have_cctk*, otherwise it contains minor changes here and there, code cleanup and such. Please confirm testglobal and testlocal reduce
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@66 7daa882c-dc44-4453-834e-278d26b18e6a
Diffstat (limited to 'src/ReductionNorm4.c')
-rw-r--r-- | src/ReductionNorm4.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/ReductionNorm4.c b/src/ReductionNorm4.c index c945555..1685c7c 100644 --- a/src/ReductionNorm4.c +++ b/src/ReductionNorm4.c @@ -160,13 +160,13 @@ static int ReductionL4 (int N_dims, int operator_handle, /* temporary complex variables*/ CCTK_COMPLEX cmplx_tmp; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 CCTK_COMPLEX8 cmplx_tmp8; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 CCTK_COMPLEX16 cmplx_tmp16; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 CCTK_COMPLEX32 cmplx_tmp32; #endif @@ -267,22 +267,22 @@ static int ReductionL4 (int N_dims, int operator_handle, case CCTK_VARIABLE_INT: ierr = LocalReduce_Norm4_INT(i, weight_on, weight, 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, param_table_handle); break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: ierr = LocalReduce_Norm4_INT1(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: ierr = LocalReduce_Norm4_INT2(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: ierr = LocalReduce_Norm4_INT4(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: ierr = LocalReduce_Norm4_INT8(i, weight_on, weight, 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, param_table_handle); break; @@ -290,17 +290,17 @@ static int ReductionL4 (int N_dims, int operator_handle, case CCTK_VARIABLE_REAL: ierr = LocalReduce_Norm4_REAL(i, weight_on, weight, 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, param_table_handle); break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: ierr = LocalReduce_Norm4_REAL4(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: ierr = LocalReduce_Norm4_REAL8(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: ierr = LocalReduce_Norm4_REAL16(i, weight_on, weight, 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, param_table_handle); break; @@ -308,17 +308,17 @@ static int ReductionL4 (int N_dims, int operator_handle, case CCTK_VARIABLE_COMPLEX: ierr = LocalReduce_Norm4_COMPLEX(i, weight_on, weight, 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, param_table_handle); break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: ierr = LocalReduce_Norm4_COMPLEX8(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: ierr = LocalReduce_Norm4_COMPLEX16(i, weight_on, weight, 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, param_table_handle); break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: ierr = LocalReduce_Norm4_COMPLEX32(i, weight_on, weight, 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, param_table_handle); break; @@ -359,25 +359,25 @@ static int ReductionL4 (int N_dims, int operator_handle, *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / weight_sum; *( (CCTK_INT *) output_numbers[i]) = pow(*( (CCTK_INT *) output_numbers[i]), 1.0/4.0); break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: *( (CCTK_INT1 *) output_numbers[i]) = *( (CCTK_INT1 *) output_numbers[i]) / weight_sum; *( (CCTK_INT1 *) output_numbers[i]) = pow(*( (CCTK_INT1 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: *( (CCTK_INT2 *) output_numbers[i]) = *( (CCTK_INT2 *) output_numbers[i]) / weight_sum; *( (CCTK_INT2 *) output_numbers[i]) = pow(*( (CCTK_INT2 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: *( (CCTK_INT4 *) output_numbers[i]) = *( (CCTK_INT4 *) output_numbers[i]) / weight_sum; *( (CCTK_INT4 *) output_numbers[i]) = pow( *( (CCTK_INT4 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: *( (CCTK_INT8 *) output_numbers[i]) = *( (CCTK_INT8 *) output_numbers[i]) / weight_sum; *( (CCTK_INT8 *) output_numbers[i]) = pow(*( (CCTK_INT8 *) output_numbers[i]), 1.0/4.0); @@ -387,19 +387,19 @@ static int ReductionL4 (int N_dims, int operator_handle, *( (CCTK_REAL *) output_numbers[i]) = *( (CCTK_REAL *) output_numbers[i]) / weight_sum; *( (CCTK_REAL *) output_numbers[i]) = pow(*( (CCTK_REAL *) output_numbers[i]), 1.0/4.0); break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: *( (CCTK_REAL4 *) output_numbers[i]) = *( (CCTK_REAL4 *) output_numbers[i]) / weight_sum; *( (CCTK_REAL4 *) output_numbers[i]) = pow(*( (CCTK_REAL4 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: *( (CCTK_REAL8 *) output_numbers[i]) = *( (CCTK_REAL8 *) output_numbers[i]) / weight_sum; *( (CCTK_REAL8 *) output_numbers[i]) = pow(*( (CCTK_REAL8 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: *( (CCTK_REAL16 *) output_numbers[i]) = *( (CCTK_REAL16 *) output_numbers[i]) / weight_sum; *( (CCTK_REAL16 *) output_numbers[i]) = pow(*( (CCTK_REAL16 *) output_numbers[i]), 1.0/4.0); @@ -414,7 +414,7 @@ static int ReductionL4 (int N_dims, int operator_handle, (*( (CCTK_COMPLEX *) output_numbers[i])).Re = cmplx_tmp.Re; (*( (CCTK_COMPLEX *) output_numbers[i])).Im = cmplx_tmp.Im; break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re / weight_sum; (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im / weight_sum; @@ -425,7 +425,7 @@ static int ReductionL4 (int N_dims, int operator_handle, (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im = cmplx_tmp8.Im; break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re / weight_sum; (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im / weight_sum; @@ -436,7 +436,7 @@ static int ReductionL4 (int N_dims, int operator_handle, (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im = cmplx_tmp16.Im; break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re / weight_sum; (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im / weight_sum; @@ -471,25 +471,25 @@ static int ReductionL4 (int N_dims, int operator_handle, *( (CCTK_INT *) output_numbers[i]) = *( (CCTK_INT *) output_numbers[i]) / num_points; *( (CCTK_INT *) output_numbers[i]) = pow(*( (CCTK_INT *) output_numbers[i]), 1.0/4.0); break; - #ifdef CCTK_INT1 + #ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: *( (CCTK_INT1 *) output_numbers[i]) = *( (CCTK_INT1 *) output_numbers[i]) / num_points; *( (CCTK_INT1 *) output_numbers[i]) = pow(*( (CCTK_INT1 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_INT2 + #ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: *( (CCTK_INT2 *) output_numbers[i]) = *( (CCTK_INT2 *) output_numbers[i]) / num_points; *( (CCTK_INT2 *) output_numbers[i]) = pow(*( (CCTK_INT2 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_INT4 + #ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: *( (CCTK_INT4 *) output_numbers[i]) = *( (CCTK_INT4 *) output_numbers[i]) / num_points; *( (CCTK_INT4 *) output_numbers[i]) = pow( *( (CCTK_INT4 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_INT8 + #ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: *( (CCTK_INT8 *) output_numbers[i]) = *( (CCTK_INT8 *) output_numbers[i]) / num_points; *( (CCTK_INT8 *) output_numbers[i]) = pow(*( (CCTK_INT8 *) output_numbers[i]), 1.0/4.0); @@ -499,19 +499,19 @@ static int ReductionL4 (int N_dims, int operator_handle, *( (CCTK_REAL *) output_numbers[i]) = *( (CCTK_REAL *) output_numbers[i]) / num_points; *( (CCTK_REAL *) output_numbers[i]) = pow(*( (CCTK_REAL *) output_numbers[i]), 1.0/4.0); break; - #ifdef CCTK_REAL4 + #ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: *( (CCTK_REAL4 *) output_numbers[i]) = *( (CCTK_REAL4 *) output_numbers[i]) / num_points; *( (CCTK_REAL4 *) output_numbers[i]) = pow(*( (CCTK_REAL4 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_REAL8 + #ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: *( (CCTK_REAL8 *) output_numbers[i]) = *( (CCTK_REAL8 *) output_numbers[i]) / num_points; *( (CCTK_REAL8 *) output_numbers[i]) = pow(*( (CCTK_REAL8 *) output_numbers[i]), 1.0/4.0); break; #endif - #ifdef CCTK_REAL16 + #ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: *( (CCTK_REAL16 *) output_numbers[i]) = *( (CCTK_REAL16 *) output_numbers[i]) / num_points; *( (CCTK_REAL16 *) output_numbers[i]) = pow(*( (CCTK_REAL16 *) output_numbers[i]), 1.0/4.0); @@ -526,7 +526,7 @@ static int ReductionL4 (int N_dims, int operator_handle, (*( (CCTK_COMPLEX *) output_numbers[i])).Re = cmplx_tmp.Re; (*( (CCTK_COMPLEX *) output_numbers[i])).Im = cmplx_tmp.Im; break; - #ifdef CCTK_COMPLEX8 + #ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Re / num_points; (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im / num_points; @@ -537,7 +537,7 @@ static int ReductionL4 (int N_dims, int operator_handle, (*( (CCTK_COMPLEX8 *) output_numbers[i])).Im = cmplx_tmp8.Im; break; #endif - #ifdef CCTK_COMPLEX16 + #ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Re / num_points; (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im / num_points; @@ -548,7 +548,7 @@ static int ReductionL4 (int N_dims, int operator_handle, (*( (CCTK_COMPLEX16 *) output_numbers[i])).Im = cmplx_tmp16.Im; break; #endif - #ifdef CCTK_COMPLEX32 + #ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Re / num_points; (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im = (*( (CCTK_COMPLEX32 *) output_numbers[i])).Im / num_points; |