Making sure that externally resolvable symbols are globally unique.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalReduce/trunk@14 7daa882c-dc44-4453-834e-278d26b18e6a

13 files changed, 359 insertions, 359 deletions

diff --git a/src/Reduction.c b/src/Reduction.c
index c42c62b..91d3bc6 100644
--- a/src/Reduction.c
+++ b/src/Reduction.c
@@ -31,7 +31,7 @@ static int copy_real_to_outtype (int num_elems,
  ********************************************************************/
 
  /*@@
-   @routine    ReductionArrays
+   @routine    LocalReduce_Reduce
    @author     Thomas Radke, Yaakoub El Khamra
    @date       
    @desc
@@ -92,15 +92,15 @@ static int copy_real_to_outtype (int num_elems,
   @vio     in
   @endvar
 @@*/
-int ReductionArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[],
-                          reduction_fn_t reduction_fn)
+int LocalReduce_Reduce (int N_dims, int operator_handle, 
+                        int param_table_handle,   int N_input_arrays,
+                        const CCTK_INT input_array_dims[], 
+                        const CCTK_INT input_array_type_codes[],
+                        const void *const input_arrays[],
+                        int M_output_numbers,
+                        const CCTK_INT output_number_type_codes[],
+                        void *const output_numbers[],
+                        reduction_fn_t reduction_fn)
 {
   int i, num_points, retval;
   int from[1], to[1], iterator[1], points_per_dim[1];
@@ -121,7 +121,7 @@ int ReductionArrays (int N_dims, int operator_handle,
   /* check for zero-sized arrays */
   if (to[0] <= 0)
   {
-    CCTK_WARN (2, "ReductionArrays: Cannot reduce zero-sized arrays");
+    CCTK_WARN (2, "LocalReduce_Reduce: Cannot reduce zero-sized arrays");
     return (-1);
   }
 
@@ -130,7 +130,7 @@ int ReductionArrays (int N_dims, int operator_handle,
     if (M_output_numbers != to[0])
     {
       CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
-                  "LocalReductionArrays: Don't know how to reduce "
+                  "LocalLocalReduce_Reduce: Don't know how to reduce "
                   "a %d-dimensional array with %d elements "
                   "to an output array of %d elements",
                   N_dims, to[0], M_output_numbers);
diff --git a/src/ReductionAvg.c b/src/ReductionAvg.c
index a393ef4..976efd1 100644
--- a/src/ReductionAvg.c
+++ b/src/ReductionAvg.c
@@ -34,7 +34,7 @@ static int ReductionAvg (int num_dims,
 
 
 /*@@
-  @routine ReductionAvgArrays
+  @routine LocalReduce_Mean
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
@@ -92,16 +92,16 @@ static int ReductionAvg (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionAvgArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_Mean (int N_dims, int operator_handle, 
+                      int param_table_handle,   int N_input_arrays,
+                      const CCTK_INT input_array_dims[], 
+                      const CCTK_INT input_array_type_codes[],
+                      const void *const input_arrays[],
+                      int M_output_numbers,
+                      const CCTK_INT output_number_type_codes[],
+                      void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
                           param_table_handle, N_input_arrays,
                           input_array_dims, input_array_type_codes,
                           input_arrays, M_output_numbers,
diff --git a/src/ReductionCount.c b/src/ReductionCount.c
index d96d07c..0964b04 100644
--- a/src/ReductionCount.c
+++ b/src/ReductionCount.c
@@ -20,21 +20,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionCount_c);
 
 /* local function prototypes */
 static int ReductionCount (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine ReductionCountArrays
+  @routine LocalReduce_Count
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
@@ -98,21 +98,21 @@ static int ReductionCount (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionCountArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_Count (int N_dims, int operator_handle, 
+                       int param_table_handle,   int N_input_arrays,
+                       const CCTK_INT input_array_dims[], 
+                       const CCTK_INT input_array_type_codes[],
+                       const void *const input_arrays[],
+                       int M_output_numbers,
+                       const CCTK_INT output_number_type_codes[],
+                       void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionCount));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionCount));
 }
 
 /*****************************************************************************/
@@ -127,17 +127,17 @@ int ReductionCountArrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionCount (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i;
 
diff --git a/src/ReductionMax.c b/src/ReductionMax.c
index 51747e7..0e1a9c6 100644
--- a/src/ReductionMax.c
+++ b/src/ReductionMax.c
@@ -21,21 +21,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionMax_c);
 
 /* local function prototypes */
 static int ReductionMaxVal (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                            const int from[/* dim */],
+                            const int to[/* dim */],
+                            int iterator[/* dim */],
+                            const int points_per_dim[/* dim */],
+                            int num_points,
+                            int have_local_points,
+                            int num_inarrays,
+                            const int intypes[/* num_inarrays */],
+                            const void *const inarrays[/* num_inarrays */],
+                            int num_outvals,
+                            CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine ReductionMaxValArrays
+  @routine LocalReduce_Max
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc  @enddesc
@@ -93,21 +93,21 @@ static int ReductionMaxVal (int num_dims,
   @endvar
 @@*/
 
-int ReductionMaxValArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_Max (int N_dims, int operator_handle, 
+                     int param_table_handle,   int N_input_arrays,
+                     const CCTK_INT input_array_dims[], 
+                     const CCTK_INT input_array_type_codes[],
+                     const void *const input_arrays[],
+                     int M_output_numbers,
+                     const CCTK_INT output_number_type_codes[],
+                     void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionMaxVal));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionMaxVal));
 }
 
 
@@ -125,17 +125,17 @@ int ReductionMaxValArrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionMaxVal (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                            const int from[/* dim */],
+                            const int to[/* dim */],
+                            int iterator[/* dim */],
+                            const int points_per_dim[/* dim */],
+                            int num_points,
+                            int have_local_points,
+                            int num_inarrays,
+                            const int intypes[/* num_inarrays */],
+                            const void *const inarrays[/* num_inarrays */],
+                            int num_outvals,
+                            CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
   const char *vtypename;
diff --git a/src/ReductionMin.c b/src/ReductionMin.c
index d049079..af6a228 100644
--- a/src/ReductionMin.c
+++ b/src/ReductionMin.c
@@ -21,21 +21,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionMin_c);
 
 /* local function prototypes */
 static int ReductionMinVal (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                            const int from[/* dim */],
+                            const int to[/* dim */],
+                            int iterator[/* dim */],
+                            const int points_per_dim[/* dim */],
+                            int num_points,
+                            int have_local_points,
+                            int num_inarrays,
+                            const int intypes[/* num_inarrays */],
+                            const void *const inarrays[/* num_inarrays */],
+                            int num_outvals,
+                            CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine ReductionMinValArrays
+  @routine LocalReduce_Min
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
@@ -93,21 +93,21 @@ static int ReductionMinVal (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionMinValArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_Min (int N_dims, int operator_handle, 
+                     int param_table_handle,   int N_input_arrays,
+                     const CCTK_INT input_array_dims[], 
+                     const CCTK_INT input_array_type_codes[],
+                     const void *const input_arrays[],
+                     int M_output_numbers,
+                     const CCTK_INT output_number_type_codes[],
+                     void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionMinVal));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionMinVal));
 }
 
 
@@ -126,17 +126,17 @@ int ReductionMinValArrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionMinVal (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                            const int from[/* dim */],
+                            const int to[/* dim */],
+                            int iterator[/* dim */],
+                            const int points_per_dim[/* dim */],
+                            int num_points,
+                            int have_local_points,
+                            int num_inarrays,
+                            const int intypes[/* num_inarrays */],
+                            const void *const inarrays[/* num_inarrays */],
+                            int num_outvals,
+                            CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
   const char *vtypename;
diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c
index bcc3d3e..f50edaf 100644
--- a/src/ReductionNorm1.c
+++ b/src/ReductionNorm1.c
@@ -21,21 +21,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionNorm1_c);
 
 /* local function prototypes */
 static int ReductionNorm1 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine LocalReductionNorm1Arrays
+  @routine LocalLocalReduce_L1
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
@@ -93,21 +93,21 @@ static int ReductionNorm1 (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionNorm1Arrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_L1 (int N_dims, int operator_handle, 
+                    int param_table_handle,   int N_input_arrays,
+                    const CCTK_INT input_array_dims[], 
+                    const CCTK_INT input_array_type_codes[],
+                    const void *const input_arrays[],
+                    int M_output_numbers,
+                    const CCTK_INT output_number_type_codes[],
+                    void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionNorm1));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionNorm1));
 }
 
 
@@ -126,17 +126,17 @@ int ReductionNorm1Arrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionNorm1 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
 
diff --git a/src/ReductionNorm2.c b/src/ReductionNorm2.c
index 90deedc..5bdf3f4 100644
--- a/src/ReductionNorm2.c
+++ b/src/ReductionNorm2.c
@@ -22,21 +22,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionNorm2_c);
 
 /* local function prototypes */
 static int ReductionNorm2 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine LocalReductionNorm2Arrays
+  @routine LocalLocalReduce_L2
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
@@ -94,21 +94,21 @@ static int ReductionNorm2 (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionNorm2Arrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_L2 (int N_dims, int operator_handle, 
+                    int param_table_handle,   int N_input_arrays,
+                    const CCTK_INT input_array_dims[], 
+                    const CCTK_INT input_array_type_codes[],
+                    const void *const input_arrays[],
+                    int M_output_numbers,
+                    const CCTK_INT output_number_type_codes[],
+                    void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionNorm2));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionNorm2));
 }
 
 
@@ -128,17 +128,17 @@ int ReductionNorm2Arrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionNorm2 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
 
diff --git a/src/ReductionNorm3.c b/src/ReductionNorm3.c
index b80fb38..97200af 100644
--- a/src/ReductionNorm3.c
+++ b/src/ReductionNorm3.c
@@ -22,21 +22,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionNorm3_c);
 
 /* local function prototypes */
 static int ReductionNorm3 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine LocalReductionNorm3Arrays
+  @routine LocalLocalReduce_L3
   @author  Thomas Radke
   @date    Tue Apr 15 2003
   @desc
@@ -94,21 +94,21 @@ static int ReductionNorm3 (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionNorm3Arrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_L3 (int N_dims, int operator_handle, 
+                    int param_table_handle,   int N_input_arrays,
+                    const CCTK_INT input_array_dims[], 
+                    const CCTK_INT input_array_type_codes[],
+                    const void *const input_arrays[],
+                    int M_output_numbers,
+                    const CCTK_INT output_number_type_codes[],
+                    void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionNorm3));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionNorm3));
 }
 
 
@@ -127,17 +127,17 @@ int ReductionNorm3Arrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionNorm3 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
 
diff --git a/src/ReductionNorm4.c b/src/ReductionNorm4.c
index 823c29e..3ab1972 100644
--- a/src/ReductionNorm4.c
+++ b/src/ReductionNorm4.c
@@ -22,21 +22,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionNorm4_c);
 
 /* local function prototypes */
 static int ReductionNorm4 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine LocalReductionNorm4Arrays
+  @routine LocalLocalReduce_L4
   @author  Thomas Radke
   @date    Tue Apr 15 2003
   @desc
@@ -94,21 +94,21 @@ static int ReductionNorm4 (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionNorm4Arrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_L4 (int N_dims, int operator_handle, 
+                    int param_table_handle,   int N_input_arrays,
+                    const CCTK_INT input_array_dims[], 
+                    const CCTK_INT input_array_type_codes[],
+                    const void *const input_arrays[],
+                    int M_output_numbers,
+                    const CCTK_INT output_number_type_codes[],
+                    void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionNorm4));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionNorm4));
 }
 
 
@@ -127,17 +127,17 @@ int ReductionNorm4Arrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionNorm4 (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                           const int from[/* dim */],
+                           const int to[/* dim */],
+                           int iterator[/* dim */],
+                           const int points_per_dim[/* dim */],
+                           int num_points,
+                           int have_local_points,
+                           int num_inarrays,
+                           const int intypes[/* num_inarrays */],
+                           const void *const inarrays[/* num_inarrays */],
+                           int num_outvals,
+                           CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
 
diff --git a/src/ReductionNormInf.c b/src/ReductionNormInf.c
index 6a9b8a9..a4f88c2 100644
--- a/src/ReductionNormInf.c
+++ b/src/ReductionNormInf.c
@@ -22,21 +22,21 @@ CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionNormInf_c);
 
 /* local function prototypes */
 static int ReductionNormInf (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
+                             const int from[/* dim */],
+                             const int to[/* dim */],
+                             int iterator[/* dim */],
+                             const int points_per_dim[/* dim */],
+                             int num_points,
+                             int have_local_points,
+                             int num_inarrays,
+                             const int intypes[/* num_inarrays */],
+                             const void *const inarrays[/* num_inarrays */],
+                             int num_outvals,
+                             CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
 
 /*@@
-  @routine LocalReductionNormInfArrays
+  @routine LocalLocalReduce_LInf
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
@@ -94,21 +94,21 @@ static int ReductionNormInf (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionNormInfArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_input_arrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const input_arrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_LInf (int N_dims, int operator_handle, 
+                      int param_table_handle,   int N_input_arrays,
+                      const CCTK_INT input_array_dims[], 
+                      const CCTK_INT input_array_type_codes[],
+                      const void *const input_arrays[],
+                      int M_output_numbers,
+                      const CCTK_INT output_number_type_codes[],
+                      void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_input_arrays,
-                          input_array_dims, input_array_type_codes,
-                          input_arrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionNormInf));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_input_arrays,
+                           input_array_dims, input_array_type_codes,
+                           input_arrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionNormInf));
 }
 
 
@@ -127,17 +127,17 @@ int ReductionNormInfArrays (int N_dims, int operator_handle,
    @enddesc
 @@*/
 static int ReductionNormInf (int num_dims,
-                         const int from[/* dim */],
-                         const int to[/* dim */],
-                         int iterator[/* dim */],
-                         const int points_per_dim[/* dim */],
-                         int num_points,
-                         int have_local_points,
-                         int num_inarrays,
-                         const int intypes[/* num_inarrays */],
-                         const void *const inarrays[/* num_inarrays */],
-                         int num_outvals,
-                         CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
+                             const int from[/* dim */],
+                             const int to[/* dim */],
+                             int iterator[/* dim */],
+                             const int points_per_dim[/* dim */],
+                             int num_points,
+                             int have_local_points,
+                             int num_inarrays,
+                             const int intypes[/* num_inarrays */],
+                             const void *const inarrays[/* num_inarrays */],
+                             int num_outvals,
+                             CCTK_REAL outvals[/*num_inarrays*num_outvals*/])
 {
   int i, total_outvals;
 
diff --git a/src/ReductionSum.c b/src/ReductionSum.c
index b020803..8e0002a 100644
--- a/src/ReductionSum.c
+++ b/src/ReductionSum.c
@@ -35,7 +35,7 @@ static int ReductionSum (int num_dims,
 
 
 /*@@
-  @routine ReductionSumArrays
+  @routine LocalReduce_Sum
   @author  Thomas Radke, Yaakoub El Khamra
   @date    
   @desc
@@ -94,21 +94,21 @@ static int ReductionSum (int num_dims,
   @vio     in
   @endvar
 @@*/
-int ReductionSumArrays (int N_dims, int operator_handle, 
-                          int param_table_handle,   int N_inarrays,
-                          const CCTK_INT input_array_dims[], 
-                          const CCTK_INT input_array_type_codes[],
-                          const void *const inarrays[],
-                          int M_output_numbers,
-                          const CCTK_INT output_number_type_codes[],
-                          void *const output_numbers[])
+int LocalReduce_Sum (int N_dims, int operator_handle, 
+                     int param_table_handle,   int N_inarrays,
+                     const CCTK_INT input_array_dims[], 
+                     const CCTK_INT input_array_type_codes[],
+                     const void *const inarrays[],
+                     int M_output_numbers,
+                     const CCTK_INT output_number_type_codes[],
+                     void *const output_numbers[])
 {
-  return (ReductionArrays (N_dims, operator_handle, 
-                          param_table_handle, N_inarrays,
-                          input_array_dims, input_array_type_codes,
-                          inarrays, M_output_numbers,
-                          output_number_type_codes, output_numbers,
-                          ReductionSum));
+  return (LocalReduce_Reduce (N_dims, operator_handle, 
+                           param_table_handle, N_inarrays,
+                           input_array_dims, input_array_type_codes,
+                           inarrays, M_output_numbers,
+                           output_number_type_codes, output_numbers,
+                           ReductionSum));
 }
 
 
diff --git a/src/Startup.c b/src/Startup.c
index d182833..0e50088 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -24,21 +24,21 @@ int LocalReduce_Startup (void)
 {
   /* Register the reduction operators */
 
-  CCTK_RegisterLocalArrayReductionOperator (ReductionAvgArrays,     "average");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionAvgArrays,     "mean");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionCountArrays,   "count");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionMaxValArrays,  "maximum");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionMinValArrays,  "minimum");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm1Arrays,   "norm1");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm1Arrays,   "L1Norm");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm2Arrays,   "norm2");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm2Arrays,   "L2Norm");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm3Arrays,   "norm3");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm3Arrays,   "L3Norm");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm4Arrays,   "norm4");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNorm4Arrays,   "L4Norm");
-  CCTK_RegisterLocalArrayReductionOperator (ReductionNormInfArrays, "norm_inf"); 
-  CCTK_RegisterLocalArrayReductionOperator (ReductionSumArrays,     "sum");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_Mean,     "average");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_Mean,     "mean");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_Count,   "count");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_Max,  "maximum");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_Min,  "minimum");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L1,   "norm1");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L1,   "L1Norm");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L2,   "norm2");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L2,   "L2Norm");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L3,   "norm3");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L3,   "L3Norm");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L4,   "norm4");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_L4,   "L4Norm");
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_LInf, "norm_inf"); 
+  CCTK_RegisterLocalArrayReductionOperator (LocalReduce_Sum,     "sum");
   printf("\n success\n");
   return (0);
 }
diff --git a/src/local_reductions.h b/src/local_reductions.h
index 7a6f9a2..07e51d7 100644
--- a/src/local_reductions.h
+++ b/src/local_reductions.h
@@ -142,16 +142,16 @@ extern "C" {
 #endif
 
 
-int ReductionAvgArrays     (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionCountArrays   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionMaxValArrays  (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionMinValArrays  (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionNorm1Arrays   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionNorm2Arrays   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionNorm3Arrays   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionNorm4Arrays   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionNormInfArrays (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
-int ReductionSumArrays     (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_Mean     (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_Count   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_Max  (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_Min  (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_L1   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_L2   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_L3   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_L4   (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_LInf (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
+int LocalReduce_Sum     (REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST);
 
 typedef int (*reduction_fn_t) (int num_dims,
                                const int from[/* dim */],
@@ -166,7 +166,7 @@ typedef int (*reduction_fn_t) (int num_dims,
                                int num_outvals,
                                CCTK_REAL outvals[/*num_inarrays*num_outvals*/]);
 
-int ReductionArrays (int N_dims, int operator_handle, 
+int LocalReduce_Reduce (int N_dims, int operator_handle, 
                           int param_table_handle,   int N_input_arrays,
                           const CCTK_INT input_array_dims[], 
                           const CCTK_INT input_array_type_codes[],