changed mpi_operation to global_operation-better naming

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

1 files changed, 44 insertions, 44 deletions

diff --git a/src/ReduceGA.c b/src/ReduceGA.c
index b8bae1c..c9c0311 100644
--- a/src/ReduceGA.c
+++ b/src/ReduceGA.c
@@ -135,7 +135,7 @@ static int ReduceGridArrays (const cGH *GH,
 
 
 #ifdef CCTK_MPI
-  int nprocs = 0, myproc =0, mpi_operation = 0;
+  int nprocs = 0, myproc =0, global_operation = 0;
   const pGH *pughGH = NULL;
   void *local_outvals = NULL;
   nprocs = CCTK_nProcs(GH);
@@ -214,7 +214,7 @@ static int ReduceGridArrays (const cGH *GH,
 #ifdef CCTK_MPI
   pughGH = PUGH_pGH (GH);
   ierr = Util_TableGetInt(param_table_handle, &proc, "proc");
-  ierr = Util_TableGetInt(param_table_handle, &mpi_operation, "mpi_operation");
+  ierr = Util_TableGetInt(param_table_handle, &global_operation, "global_operation");
 
   CACTUS_MPI_ERROR (MPI_Allreduce (&num_points, &total_num_points, 1,
                     PUGH_MPI_INT, MPI_SUM, pughGH->PUGH_COMM_WORLD));
@@ -230,13 +230,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_CHAR *) output_values[i], 1 * sizeof (CCTK_CHAR));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_CHAR *) output_values[i], 1,
                         PUGH_MPI_CHAR, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_CHAR *) output_values[i], 1,
                         PUGH_MPI_CHAR, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_CHAR *) output_values[i], 1,
                         PUGH_MPI_CHAR, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -246,13 +246,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_INT *) output_values[i], 1 * sizeof (CCTK_INT));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT *) output_values[i], 1,
                         PUGH_MPI_INT, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT *) output_values[i], 1,
                         PUGH_MPI_INT, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT *) output_values[i], 1,
                         PUGH_MPI_INT, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -263,13 +263,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_INT1 *) output_values[i], 1 * sizeof (CCTK_INT1));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT1 *) output_values[i], 1,
                         PUGH_MPI_INT1, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT1 *) output_values[i], 1,
                         PUGH_MPI_INT1, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT1 *) output_values[i], 1,
                         PUGH_MPI_INT1, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -281,13 +281,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_INT2 *) output_values[i], 1 * sizeof (CCTK_INT2));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT2 *) output_values[i], 1,
                         PUGH_MPI_INT2, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT2 *) output_values[i], 1,
                         PUGH_MPI_INT2, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT2 *) output_values[i], 1,
                         PUGH_MPI_INT2, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -299,13 +299,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_INT4 *) output_values[i], 1 * sizeof (CCTK_INT4));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT4 *) output_values[i], 1,
                         PUGH_MPI_INT4, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT4 *) output_values[i], 1,
                         PUGH_MPI_INT4, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT4 *) output_values[i], 1,
                         PUGH_MPI_INT4, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -317,13 +317,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_INT8 *) output_values[i], 1 * sizeof (CCTK_INT8));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT8 *) output_values[i], 1,
                         PUGH_MPI_INT8, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT8 *) output_values[i], 1,
                         PUGH_MPI_INT8, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_INT8 *) output_values[i], 1,
                         PUGH_MPI_INT8, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;                                                                
@@ -334,13 +334,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_REAL *) output_values[i], 1 * sizeof (CCTK_REAL));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL *) output_values[i], 1,
                         PUGH_MPI_REAL, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL *) output_values[i], 1,
                         PUGH_MPI_REAL, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL *) output_values[i], 1,
                         PUGH_MPI_REAL, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -351,13 +351,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_REAL4 *) output_values[i], 1 * sizeof (CCTK_REAL4));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL4 *) output_values[i], 1,
                         PUGH_MPI_REAL4, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL4 *) output_values[i], 1,
                         PUGH_MPI_REAL4, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL4 *) output_values[i], 1,
                         PUGH_MPI_REAL4, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -369,13 +369,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_REAL8 *) output_values[i], 1 * sizeof (CCTK_REAL8));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL8 *) output_values[i], 1,
                         PUGH_MPI_REAL8, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL8 *) output_values[i], 1,
                         PUGH_MPI_REAL8, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL8 *) output_values[i], 1,
                         PUGH_MPI_REAL8, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -387,13 +387,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_REAL16 *) output_values[i], 1 * sizeof (CCTK_REAL16));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL16 *) output_values[i], 1,
                         PUGH_MPI_REAL16, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL16 *) output_values[i], 1,
                         PUGH_MPI_REAL16, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_REAL16 *) output_values[i], 1,
                         PUGH_MPI_REAL16, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -404,13 +404,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_COMPLEX *) output_values[i], 1 * sizeof (CCTK_COMPLEX));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -421,13 +421,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_COMPLEX8 *) output_values[i], 1 * sizeof (CCTK_COMPLEX8));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX8 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex8, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX8 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex8, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX8 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex8, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -439,13 +439,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_COMPLEX16 *) output_values[i], 1 * sizeof (CCTK_COMPLEX16));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX16 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex16, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX16 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex16, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX16 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex16, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;
@@ -457,13 +457,13 @@ static int ReduceGridArrays (const cGH *GH,
         /* outvals[] contains now the local reduction values */
         memcpy ( local_outvals, (CCTK_COMPLEX32 *) output_values[i], 1 * sizeof (CCTK_COMPLEX32));
 
-        if (mpi_operation == 1)
+        if (global_operation == 1)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX32 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex32, MPI_MAX, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 2)
+        else if (global_operation == 2)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX32 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex32, MPI_MIN, pughGH->PUGH_COMM_WORLD));         
-        else if (mpi_operation == 3)
+        else if (global_operation == 3)
           CACTUS_MPI_ERROR (MPI_Allreduce (local_outvals, (CCTK_COMPLEX32 *) output_values[i], 1,
                         pughGH->PUGH_mpi_complex32, MPI_SUM, pughGH->PUGH_COMM_WORLD));         
       break;