From d4b22b6454ff7f650275729b1639987531139da8 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 13 Apr 2010 14:47:12 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3985
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/MAKE/Makefile.glory | 15 +++++++++------
 src/XTC/xdr_compat.h    | 15 +++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/MAKE/Makefile.glory b/src/MAKE/Makefile.glory
index d39208aa84..db945281af 100644
--- a/src/MAKE/Makefile.glory
+++ b/src/MAKE/Makefile.glory
@@ -5,17 +5,20 @@ SHELL = /bin/sh
 
 # this Makefile builds LAMMPS for mvapich running on Glory
 # to invoke this Makefile, you need these modules loaded:
-#   compilers/intel-10.1-f015-c015
-#   misc/env-mvapich
-#   mpi/mvapich-1.0.1_ofed_intel-10.1-f015-c015
-#   libraries/fftw-2.1.5_openmpi-1.2.7_ofed_intel-10.1-f015-c015
+#   compilers/intel-11.1-f064-c064
+#   mpi/mvapich-1.1_intel-11.1-f064-c064
+#   libraries/intel_fftw-11.1.064
+#   libraries/fftw-2.1.5
 # you can determine which modules are loaded by typing:
 #   module list
 # these modules are not the default ones, but can be enabled by 
 #   lines like this in your .cshrc or other start-up shell file
 #   or by typing them before you build LAMMPS:
-#     module swap mpi mpi/mvapich-1.0.1_ofed_intel-10.1-f015-c015
-#     module load libraries/fftw-2.1.5_openmpi-1.2.7_ofed_intel-10.1-f015-c015
+#     module swap mpi misc/env-mvapich
+#     module load compilers/intel-11.1-f064-c064
+#     module load mpi/mvapich-1.1_intel-11.1-f064-c064
+#     module load libraries/intel_fftw-11.1.064
+#     module load libraries/fftw-2.1.5
 # these same modules need to be loaded to submit a LAMMPS job,
 #   either interactively or via a batch script
 
diff --git a/src/XTC/xdr_compat.h b/src/XTC/xdr_compat.h
index c52fa5198a..37cad5e076 100644
--- a/src/XTC/xdr_compat.h
+++ b/src/XTC/xdr_compat.h
@@ -15,8 +15,8 @@ extern "C" {
  * most probably work on other platforms too. better make sure you
  * test that the xtc files produced are ok before using it. 
  *
- * It is also needed on BG/L and Cray XT3/XT4 as we don't have 
- * XDR support in the lightweight kernel runtimes either.
+ * It is also needed on BG/L, BG/P and Cray XT3/XT4/XT5 as we don't
+ * have XDR support in the lightweight kernel runtimes either.
  *
  * This file contains the definitions for Sun External Data 
  * Representation (XDR) headers and routines.
@@ -83,13 +83,12 @@ enum xdr_op {
   XDR_FREE = 2
 };
 
-#ifndef LMP_FALSE
-#      dLMP_efine  FALSE   (0)
+#ifndef FALSE
+#      define  FALSE   (0)
+#endif
+#ifndef TRUE
+#      define  TRUE    (1)
 #endif
-#ifndef LMP_TRUE
-#      dLMP_efine  TLMP_RUE    (1)
-#endifLMP_
-
 
 #define BYTES_PER_XDR_UNIT	(4)
 /* Macro to round up to units of 4. */