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

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

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

1 files changed, 68 insertions, 83 deletions

diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c
index 81df22a..358b5cb 100644
--- a/src/ReductionNorm1.c
+++ b/src/ReductionNorm1.c
@@ -20,107 +20,94 @@ static const char *rcsid = "$Id$";
 CCTK_FILEVERSION(CCTDevelopment_LocalReduce_ReductionNorm1_c)
 
 /* local function prototypes */
-static int ReductionNorm1 (const cGH *GH,
-                           int proc,
-                           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 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*/]);
 
 
 /*@@
-  @routine PUGH_ReductionNorm1Arrays
+  @routine LocalReductionNorm1Arrays
   @author  Thomas Radke
   @date    19 Aug 1999
   @desc
-           Registered PUGH reduction routine for computing the "norm1"
-           of a set of arrays.
-           The arrays are described by their dimensions and variable type.
-           If the number of requested output values equals the number of
-           elements in an input array, global reduction is done element-wise.
-           Otherwise num_outvals must be 1, and global reduction is done on the
-           results of the local reductions.
-           Type casting of the result is provided by specifying the
-           requested output datatype. The intermediate reduction value
-           is always computed as a CCTK_REAL value internally.
   @enddesc
   @history
   @endhistory
-  @var     GH
-  @vdesc   Pointer to CCTK grid hierarchy
-  @vtype   const cGH *
+  @var     N_dims
+  @vdesc   number of dimensions in the *reduction*
+  @vtype   int
   @vio     in
   @endvar
-  @var     proc
-  @vdesc   processor that should receive the result of operation
-           (negative value means all processors receive the result)
+  @var     operator_handle
+  @vdesc   operator handle specificies the type of reduction we will perform
   @vtype   int
   @vio     in
   @endvar
-  @var     num_dims
-  @vdesc   number of dimensions of input arrays
+  @var     param_table_handle
+  @vdesc   handle to "parameter table", a key-value table
   @vtype   int
   @vio     in
   @endvar
-  @var     dims
-  @vdesc   dimensions of input arrays
-  @vtype   const int *
+  @var     N_input_arrays
+  @vdesc   number of input arrays
+  @vtype   int 
   @vio     in
   @endvar
-  @var     num_arrays
-  @vdesc   number of input arrays
-  @vtype   int
+  @var     input_array_dims
+  @vdesc   array of input array dimensions (common to all input arrays)
+  @vtype   const CCTK_INT
   @vio     in
   @endvar
-  @var     inarrays
-  @vdesc   field of input arrays
-  @vtype   const void *const
+  @var     input_array_type_codes
+  @vdesc   array of CCTK_VARIABLE_* codes giving data types of input arrays
+  @vtype   const CCTK_INT
   @vio     in
   @endvar
-  @var     intype
-  @vdesc   (common) variable type of input arrays
-  @vtype   int
+  @var     input_arrays
+  @vdesc   array of pointers to input arrays
+  @vtype   const void *const
   @vio     in
   @endvar
-  @var     num_outvals
-  @vdesc   number of values per output array
+  @var     M_output_numbers
+  @vdesc   
   @vtype   int
   @vio     in
   @endvar
-  @var     outvals
-  @vdesc   pointer to buffer holding the output values
-  @vtype   void *
+  @var     output_number_type_codes
+  @vdesc   array of CCTK_VARIABLE_* codes giving data types of output numbers
+  @vtype   const CCTK_INT
   @vio     in
   @endvar
-  @var     outtype
-  @vdesc   (common) variable type of output arrays
-  @vtype   int
+  @var     output_numbers
+  @vdesc   array[M_output_numbers] of pointers to output numbers[M_reduce_numbers]
+  @vtype   void *const
   @vio     in
   @endvar
 @@*/
-int ReductionNorm1Arrays (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 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[])
 {
-  return (ReductionArrays (GH, proc, num_dims, dims,
-                                intype, num_inarrays, inarrays,
-                                outtype, num_outvals, outvals,
-                                ReductionNorm1));
+  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));
 }
 
 
@@ -128,7 +115,7 @@ int ReductionNorm1Arrays (const cGH *GH,
 /*                             local functions                               */
 /*****************************************************************************/
 /*@@
-   @routine    PUGH_ReductionNorm1
+   @routine    LocalReductionNorm1
    @date       Aug 19 1999
    @author     Thomas Radke
    @desc       Returns the "norm1" of a distributed array with
@@ -138,20 +125,18 @@ int ReductionNorm1Arrays (const cGH *GH,
                "norm1" is defined as $\Sigma |a_i| / np$.
    @enddesc
 @@*/
-static int ReductionNorm1 (const cGH *GH,
-                           int proc,
-                           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 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*/])
 {
   int i, total_outvals;
 
@@ -280,7 +265,7 @@ static int ReductionNorm1 (const cGH *GH,
 #endif
 
       default:
-        CCTK_WARN (1, "PUGH_ReductionNorm1: Unknown variable type");
+        CCTK_WARN (1, "LocalReductionNorm1: Unknown variable type");
         return (-1);
     }
   }