This commit was generated by cvs2svn to compensate for changes in r6, which

included commits to RCS files with non-trunk default branches.

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

1 files changed, 49 insertions, 56 deletions

diff --git a/src/ReductionAvg.c b/src/ReductionAvg.c
index 4569307..2f0c602 100644
--- a/src/ReductionAvg.c
+++ b/src/ReductionAvg.c
@@ -1,9 +1,9 @@
  /*@@
    @file      ReductionAvg.c
-   @date      Thu May  27 14:14:53 2004
-   @author    Ravi Paruchuri
+   @date      Thu Apr  3 11:54:53 1997
+   @author    Thomas Radke, Paul Walker, Erik Schnetter
    @desc
-              Defines the reduction operator to get the average
+              Defines the PUGH reduction operator to get the average
               of an arbitrary array.
    @enddesc
    @version   $Id$
@@ -12,32 +12,29 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "local_reductions.h"
 
 static const char *rcsid = "$Id$";
 
-CCTK_FILEVERSION(CactusBase_LocalReduce_ReductionAvg_c)
+CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionAvg_c)
 
 /* local function prototypes */
-static int ReductionAvg (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,
-                         void *outvals[/*num_inarrays*num_outvals*/]);
+static int ReductionAvg (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[]);
 
 
 /*@@
-  @routine LocalReduce_ReductionAvgArrays
-  @author  Ravi Paruchuri
-  @date    May 27 2004
+  @routine PUGH_ReductionAvgArrays
+  @author  Thomas Radke
+  @date    19 Aug 1999
   @desc
-           Registered reduction routine for computing the averages
+           Registered PUGH reduction routine for computing the averages
            of a set of arrays.
            The arrays are described by their dimensions and variable type.
            For the number of output values only 1 is accepted.
@@ -99,24 +96,22 @@ static int ReductionAvg (int num_dims,
   @vio     in
   @endvar
 @@*/
-int LocalReduce_ReductionAvgArrays (const cGH *GH,
-                             int proc,
-                             int num_dims,
-                             const int dims[/* num_dims */],
-                             int num_inarrays,
-                             const void *const inarrays[/* num_inarrays */],
-                             int intype,
-                             int num_outvals,
-                             void *outvals[], /* [num_outvals] */,
-                             int outtype)
+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[])
 {
-  return (LocalReduce_ReductionArrays (num_dims, dims,
-                                intype, num_inarrays, inarrays,
-                                outtype, num_outvals, outvals,
-                                ReductionAvg));
+  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));
 }
 
-
 /*****************************************************************************/
 /*                             local functions                               */
 /*****************************************************************************/
@@ -129,25 +124,22 @@ int LocalReduce_ReductionAvgArrays (const cGH *GH,
                (num_outvals == 1) or on the results of the local reductions.
    @enddesc
 @@*/
-static int ReductionAvg (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*/])
+static int ReductionAvg (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 i, total_outvals;
   const char *vtypename;
-  const pGH *pughGH;
 
 
   /* avoid compiler warnings about unused parameters */
+  (void) (GH + 0);
+  (void) (proc + 0);
   (void) (num_points + 0);
 
 /* macros to complete the ITERATE_ARRAY macro */
@@ -156,7 +148,7 @@ static int ReductionAvg (int num_dims,
 
   for (i = total_outvals = 0; i < num_inarrays; i++)
   {
-    switch (intypes[i])
+    switch (input_array_type_codes[i])
     {
       case CCTK_VARIABLE_CHAR:
         ITERATE_ARRAY (CCTK_BYTE, num_dims, inarrays[i],
@@ -233,24 +225,25 @@ static int ReductionAvg (int num_dims,
 #endif
 
       default:
-        vtypename = CCTK_VarTypeName (intypes[i]);
+        vtypename = CCTK_VarTypeName (input_array_type_codes[i]);
         if (vtypename && strncmp (vtypename, "CCTK_VARIABLE_COMPLEX", 21) == 0)
         {
-          CCTK_WARN (1, "LocalReduce_ReductionAvg: Don't know how to compute "
+          CCTK_WARN (1, "PUGH_ReductionAvg: Don't know how to compute "
                         "the average of complex variables !!!");
         }
         else
         {
-          CCTK_WARN (1, "LocalReduce_ReductionAvg: Unknown variable type");
+          CCTK_WARN (1, "PUGH_ReductionAvg: Unknown variable type");
         }
         return (-1);
     }
   }
 
-    for (i = 0; i < total_outvals; i++)
-    {
-      outvals[i] /= num_points;
-    }
+  /* finally assign the return value */
+  for (i = 0; i < total_outvals; i++)
+  {
+    outvals[i] /= num_points;
+  }
 
   return (0);
 }