migration from misnomer pointwise-reduction to reduce arrays globally

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGHReduce/trunk@78 d60812e6-3970-4df4-986e-c251b06effeb

4 files changed, 14 insertions, 8 deletions

diff --git a/src/ReducePointwise.c b/src/ReduceArraysGlobally.c
index de85e3e..4f7c682 100644
--- a/src/ReducePointwise.c
+++ b/src/ReduceArraysGlobally.c
@@ -1,5 +1,5 @@
  /*@@
-   @file      ReducePointwise.c
+   @file      ReduceArraysGlobally.c
    @date      
    @author    Yaakoub Y El Khamra
    @desc
@@ -22,10 +22,10 @@
 
 static const char *rcsid = "$Id:";
 
-CCTK_FILEVERSION(CactusPUGH_PUGHReduce_ReducePointwise_c);
+CCTK_FILEVERSION(CactusPUGH_PUGHReduce_ReduceArraysGlobally_c);
 
 /* local function prototypes */
-static int ReducePointwise (const cGH *GH,
+static int ReduceArraysGlobally (const cGH *GH,
                           int dest_proc,
                           int local_reduce_handle,
                           int param_table_handle,
@@ -40,7 +40,7 @@ static int ReducePointwise (const cGH *GH,
 
 
  /*@@
-   @routine    PUGH_ReducePointwise
+   @routine    PUGH_ReduceArraysGlobally
    @date       
    @author     Yaakoub El Khamra
    @desc
@@ -107,7 +107,7 @@ static int ReducePointwise (const cGH *GH,
    @vio     in
    @endvar
 @@*/
-int PUGH_ReducePointwise (const cGH *GH,
+int PUGH_ReduceArraysGlobally (const cGH *GH,
                            int dest_proc,
                            int local_reduce_handle,
                            int param_table_handle,
@@ -121,7 +121,7 @@ int PUGH_ReducePointwise (const cGH *GH,
                            void* const output_values[])
 {
   int retval;
-  retval = ReducePointwise(GH, dest_proc, local_reduce_handle,
+  retval = ReduceArraysGlobally(GH, dest_proc, local_reduce_handle,
                           param_table_handle, N_input_arrays,
                           input_arrays, input_dims,
                           input_array_dims, input_array_type_codes,
@@ -141,7 +141,7 @@ int PUGH_ReducePointwise (const cGH *GH,
    @desc       Returns the pointwise reduction of an array
    @enddesc
 @@*/
-static int ReducePointwise (const cGH *GH,
+static int ReduceArraysGlobally (const cGH *GH,
                           int dest_proc,
                           int local_reduce_handle,
                           int param_table_handle,
diff --git a/src/Startup.c b/src/Startup.c
index 872e27f..2a46428 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -40,6 +40,9 @@ int PUGHReduce_Startup (void)
   /* Register the Global reduction operator */
   CCTK_RegisterGridArrayReductionOperator(PUGH_ReduceGridArrays);
   
+  /* Register the Array reducction globally operator */
+  CCTK_RegisterReduceArraysGloballyOperator(PUGH_ReduceArraysGlobally);
+  
   /* Register the reduction operators provided by PUGH */
   CCTK_RegisterReductionOperator (PUGH_ReductionAvgGVs,     "average");
   CCTK_RegisterReductionOperator (PUGH_ReductionAvgGVs,     "mean");
diff --git a/src/make.code.defn b/src/make.code.defn
index 1ebc323..2182328 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -4,4 +4,5 @@
 # Source files in this directory
 SRCS = ReductionAvg.c ReductionCount.c ReductionMax.c ReductionMin.c          \
        ReductionNorm1.c ReductionNorm2.c ReductionNorm3.c ReductionNorm4.c    \
-       ReductionNormInf.c ReductionSum.c Startup.c Reduction.c ReduceGA.c
+       ReductionNormInf.c ReductionSum.c Startup.c Reduction.c ReduceGA.c     \
+       ReduceArraysGlobally.c
diff --git a/src/pugh_reductions.h b/src/pugh_reductions.h
index 7634497..bed64a0 100644
--- a/src/pugh_reductions.h
+++ b/src/pugh_reductions.h
@@ -141,6 +141,8 @@ extern "C" {
 #endif
 int PUGH_ReduceGridArrays (REDUCTION_GRID_ARRAY_OPERATOR_REGISTER_ARGLIST);
 
+int PUGH_ReduceArraysGlobally(REDUCTION_ARRAYS_GLOBALLY_OPERATOR_REGISTER_ARGLIST);
+
 int PUGH_ReductionAvgGVs     (REDUCTION_OPERATOR_REGISTER_ARGLIST);
 int PUGH_ReductionCountGVs   (REDUCTION_OPERATOR_REGISTER_ARGLIST);
 int PUGH_ReductionMaxValGVs  (REDUCTION_OPERATOR_REGISTER_ARGLIST);