[svn-r17318] Did some code cleanup.

t_file.c: replace the old variable, color, with a more meaningfule name of
    is_old.
t_mpi.c: use the official mpi_file_delete, instead of remove, to delete a file
    in MPI environment.

Tested: 
Only jam in parallel as changes are trivial.

1 files changed, 4 insertions, 4 deletions

diff --git a/testpar/t_file.c b/testpar/t_file.c
index 9de4e0e..ff983a9 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -36,7 +36,7 @@ test_split_comm_access(void)
     int mpi_size, mpi_rank;
     MPI_Comm comm;
     MPI_Info info = MPI_INFO_NULL;
-    int color, mrc;
+    int is_old, mrc;
     int newrank, newprocs;
     hid_t fid;			/* file IDs */
     hid_t acc_tpl;		/* File access properties */
@@ -52,13 +52,13 @@ test_split_comm_access(void)
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD,&mpi_size);
     MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
-    color = mpi_rank%2;
-    mrc = MPI_Comm_split (MPI_COMM_WORLD, color, mpi_rank, &comm);
+    is_old = mpi_rank%2;
+    mrc = MPI_Comm_split (MPI_COMM_WORLD, is_old, mpi_rank, &comm);
     VRFY((mrc==MPI_SUCCESS), "");
     MPI_Comm_size(comm,&newprocs);
     MPI_Comm_rank(comm,&newrank);
 
-    if (color){
+    if (is_old){
 	/* odd-rank processes */
 	mrc = MPI_Barrier(comm);
 	VRFY((mrc==MPI_SUCCESS), "");