Rename MPI_ variable prefixes to CACTUS_MPI_.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Slab/trunk@33 2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8

1 files changed, 65 insertions, 63 deletions

diff --git a/src/slab.c b/src/slab.c
index fdca3e8..f4450e8 100644
--- a/src/slab.c
+++ b/src/slab.c
@@ -104,65 +104,67 @@ void Slab_PrintTimers (void)
 #ifdef CCTK_MPI
 /* Determine MPI type sizes */
 
-#  define MPI_INT1 MPI_CHAR
+#  define CACTUS_MPI_BYTE MPI_CHAR
+
+#  define CACTUS_MPI_INT1 MPI_CHAR
 
 #  if SIZEOF_SHORT_INT == 2
-#    define MPI_INT2 MPI_SHORT
+#    define CACTUS_MPI_INT2 MPI_SHORT
 #  elif SIZEOF_INT == 2
-#    define MPI_INT2 MPI_INT
+#    define CACTUS_MPI_INT2 MPI_INT
 #  elif SIZEOF_LONG_INT == 2
-#    define MPI_INT2 MPI_LONG
+#    define CACTUS_MPI_INT2 MPI_LONG
 #  elif SIZEOF_LONG_LONG == 2
-#    define MPI_INT2 MPI_LONG_LONG_INT
+#    define CACTUS_MPI_INT2 MPI_LONG_LONG_INT
 #  endif
 
 #  if SIZEOF_SHORT_INT == 4
-#    define MPI_INT4 MPI_SHORT
+#    define CACTUS_MPI_INT4 MPI_SHORT
 #  elif SIZEOF_INT == 4
-#    define MPI_INT4 MPI_INT
+#    define CACTUS_MPI_INT4 MPI_INT
 #  elif SIZEOF_LONG_INT == 4
-#    define MPI_INT4 MPI_LONG
+#    define CACTUS_MPI_INT4 MPI_LONG
 #  elif SIZEOF_LONG_LONG == 4
-#    define MPI_INT4 MPI_LONG_LONG_INT
+#    define CACTUS_MPI_INT4 MPI_LONG_LONG_INT
 #  endif
 
 #  if SIZEOF_SHORT_INT == 8
-#    define MPI_INT8 MPI_SHORT
+#    define CACTUS_MPI_INT8 MPI_SHORT
 #  elif SIZEOF_INT == 8
-#    define MPI_INT8 MPI_INT
+#    define CACTUS_MPI_INT8 MPI_INT
 #  elif SIZEOF_LONG_INT == 8
-#    define MPI_INT8 MPI_LONG
+#    define CACTUS_MPI_INT8 MPI_LONG
 #  elif SIZEOF_LONG_LONG == 8
-#    define MPI_INT8 MPI_LONG_LONG_INT
+#    define CACTUS_MPI_INT8 MPI_LONG_LONG_INT
 #  endif
 
 #  if SIZEOF_FLOAT == 4
-#    define MPI_REAL4 MPI_FLOAT
+#    define CACTUS_MPI_REAL4 MPI_FLOAT
 #  elif SIZEOF_DOUBLE == 4
-#    define MPI_REAL4 MPI_DOUBLE
+#    define CACTUS_MPI_REAL4 MPI_DOUBLE
 #  elif SIZEOF_LONG_DOUBLE == 4
-#    define MPI_REAL4 MPI_LONG_DOUBLE
+#    define CACTUS_MPI_REAL4 MPI_LONG_DOUBLE
 #  endif
 
 #  if SIZEOF_FLOAT == 8
-#    define MPI_REAL8 MPI_FLOAT
+#    define CACTUS_MPI_REAL8 MPI_FLOAT
 #  elif SIZEOF_DOUBLE == 8
-#    define MPI_REAL8 MPI_DOUBLE
+#    define CACTUS_MPI_REAL8 MPI_DOUBLE
 #  elif SIZEOF_LONG_DOUBLE == 8
-#    define MPI_REAL8 MPI_LONG_DOUBLE
+#    define CACTUS_MPI_REAL8 MPI_LONG_DOUBLE
 #  endif
 
 #  if SIZEOF_FLOAT == 16
-#    define MPI_REAL16 MPI_FLOAT
+#    define CACTUS_MPI_REAL16 MPI_FLOAT
 #  elif SIZEOF_DOUBLE == 16
-#    define MPI_REAL16 MPI_DOUBLE
+#    define CACTUS_MPI_REAL16 MPI_DOUBLE
 #  elif SIZEOF_LONG_DOUBLE == 16
-#    define MPI_REAL16 MPI_LONG_DOUBLE
+#    define CACTUS_MPI_REAL16 MPI_LONG_DOUBLE
 #  endif
 
-static MPI_Datatype MPI_COMPLEX8;
-static MPI_Datatype MPI_COMPLEX16;
-static MPI_Datatype MPI_COMPLEX32;
+static MPI_Datatype CACTUS_MPI_COMPLEX8;
+static MPI_Datatype CACTUS_MPI_COMPLEX16;
+static MPI_Datatype CACTUS_MPI_COMPLEX32;
 
 #endif
 
@@ -174,20 +176,20 @@ static MPI_Datatype MPI_COMPLEX32;
 typedef int MPI_Comm;
 
 typedef enum {
-  MPI_BYTE      = CCTK_VARIABLE_BYTE,
-  MPI_INT       = CCTK_VARIABLE_INT,
-  MPI_INT1      = CCTK_VARIABLE_INT1,
-  MPI_INT2      = CCTK_VARIABLE_INT2,
-  MPI_INT4      = CCTK_VARIABLE_INT4,
-  MPI_INT8      = CCTK_VARIABLE_INT8,
-  MPI_REAL      = CCTK_VARIABLE_REAL,
-  MPI_REAL4     = CCTK_VARIABLE_REAL4,
-  MPI_REAL8     = CCTK_VARIABLE_REAL8,
-  MPI_REAL16    = CCTK_VARIABLE_REAL16,
-  MPI_COMPLEX   = CCTK_VARIABLE_COMPLEX,
-  MPI_COMPLEX8  = CCTK_VARIABLE_COMPLEX8,
-  MPI_COMPLEX16 = CCTK_VARIABLE_COMPLEX16,
-  MPI_COMPLEX32 = CCTK_VARIABLE_COMPLEX32
+  CACTUS_MPI_BYTE      = CCTK_VARIABLE_BYTE,
+  CACTUS_MPI_INT       = CCTK_VARIABLE_INT,
+  CACTUS_MPI_INT1      = CCTK_VARIABLE_INT1,
+  CACTUS_MPI_INT2      = CCTK_VARIABLE_INT2,
+  CACTUS_MPI_INT4      = CCTK_VARIABLE_INT4,
+  CACTUS_MPI_INT8      = CCTK_VARIABLE_INT8,
+  CACTUS_MPI_REAL      = CCTK_VARIABLE_REAL,
+  CACTUS_MPI_REAL4     = CCTK_VARIABLE_REAL4,
+  CACTUS_MPI_REAL8     = CCTK_VARIABLE_REAL8,
+  CACTUS_MPI_REAL16    = CCTK_VARIABLE_REAL16,
+  CACTUS_MPI_COMPLEX   = CCTK_VARIABLE_COMPLEX,
+  CACTUS_MPI_COMPLEX8  = CCTK_VARIABLE_COMPLEX8,
+  CACTUS_MPI_COMPLEX16 = CCTK_VARIABLE_COMPLEX16,
+  CACTUS_MPI_COMPLEX32 = CCTK_VARIABLE_COMPLEX32
 } MPI_Datatype;
 
 typedef enum { MPI_MIN, MPI_MAX } MPI_Op;
@@ -316,16 +318,16 @@ Slab_InitMPIDatatypes (void)
 {
 #ifdef CCTK_MPI
 #  ifdef CCTK_REAL4
-  MPI_Type_contiguous (2, MPI_REAL4, &MPI_COMPLEX8);
-  MPI_Type_commit (&MPI_COMPLEX8);
+  MPI_Type_contiguous (2, CACTUS_MPI_REAL4, &CACTUS_MPI_COMPLEX8);
+  MPI_Type_commit (&CACTUS_MPI_COMPLEX8);
 #  endif
 #  ifdef CCTK_REAL8
-  MPI_Type_contiguous (2, MPI_REAL8, &MPI_COMPLEX16);
-  MPI_Type_commit (&MPI_COMPLEX16);
+  MPI_Type_contiguous (2, CACTUS_MPI_REAL8, &CACTUS_MPI_COMPLEX16);
+  MPI_Type_commit (&CACTUS_MPI_COMPLEX16);
 #  endif
 #  ifdef CCTK_REAL16
-  MPI_Type_contiguous (2, MPI_REAL16, &MPI_COMPLEX32);
-  MPI_Type_commit (&MPI_COMPLEX32);
+  MPI_Type_contiguous (2, CACTUS_MPI_REAL16, &CACTUS_MPI_COMPLEX32);
+  MPI_Type_commit (&CACTUS_MPI_COMPLEX32);
 #  endif
 #endif
 }
@@ -384,30 +386,30 @@ static MPI_Datatype mpi_type (int const cactustype)
 {
   int const normaltype = normal_type (cactustype);
   switch (normaltype) {
-  case CCTK_VARIABLE_BYTE: return MPI_BYTE;
-#if defined CCTK_INT1 && defined MPI_INT1
-  case CCTK_VARIABLE_INT1: return MPI_INT1;
+  case CCTK_VARIABLE_BYTE: return CACTUS_MPI_BYTE;
+#if defined CCTK_INT1 && defined CACTUS_MPI_INT1
+  case CCTK_VARIABLE_INT1: return CACTUS_MPI_INT1;
 #endif
-#if defined CCTK_INT2 && defined MPI_INT2
-  case CCTK_VARIABLE_INT2: return MPI_INT2;
+#if defined CCTK_INT2 && defined CACTUS_MPI_INT2
+  case CCTK_VARIABLE_INT2: return CACTUS_MPI_INT2;
 #endif
-#if defined CCTK_INT4 && defined MPI_INT4
-  case CCTK_VARIABLE_INT4: return MPI_INT4;
+#if defined CCTK_INT4 && defined CACTUS_MPI_INT4
+  case CCTK_VARIABLE_INT4: return CACTUS_MPI_INT4;
 #endif
-#if defined CCTK_INT8 && defined MPI_INT8
-  case CCTK_VARIABLE_INT8: return MPI_INT8;
+#if defined CCTK_INT8 && defined CACTUS_MPI_INT8
+  case CCTK_VARIABLE_INT8: return CACTUS_MPI_INT8;
 #endif
-#if defined CCTK_REAL4 && defined MPI_REAL4
-  case CCTK_VARIABLE_REAL4: return MPI_REAL4;
-  case CCTK_VARIABLE_COMPLEX8: return MPI_COMPLEX8;
+#if defined CCTK_REAL4 && defined CACTUS_MPI_REAL4
+  case CCTK_VARIABLE_REAL4: return CACTUS_MPI_REAL4;
+  case CCTK_VARIABLE_COMPLEX8: return CACTUS_MPI_COMPLEX8;
 #endif
-#if defined CCTK_REAL8 && defined MPI_REAL8
-  case CCTK_VARIABLE_REAL8: return MPI_REAL8;
-  case CCTK_VARIABLE_COMPLEX16: return MPI_COMPLEX16;
+#if defined CCTK_REAL8 && defined CACTUS_MPI_REAL8
+  case CCTK_VARIABLE_REAL8: return CACTUS_MPI_REAL8;
+  case CCTK_VARIABLE_COMPLEX16: return CACTUS_MPI_COMPLEX16;
 #endif
-#if defined CCTK_REAL16 && defined MPI_REAL16
-  case CCTK_VARIABLE_REAL16: return MPI_REAL16;
-  case CCTK_VARIABLE_COMPLEX32: return MPI_COMPLEX32;
+#if defined CCTK_REAL16 && defined CACTUS_MPI_REAL16
+  case CCTK_VARIABLE_REAL16: return CACTUS_MPI_REAL16;
+  case CCTK_VARIABLE_COMPLEX32: return CACTUS_MPI_COMPLEX32;
 #endif
   }
   assert (0);