From 07e9b93a99f4e2050c8b4b87e77b0f26bed27eed Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 17 Feb 2012 15:43:16 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7815
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/balance.cpp |  1 +
 src/lattice.cpp | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/balance.cpp b/src/balance.cpp
index 8dfbe75fd5..e39795ed63 100644
--- a/src/balance.cpp
+++ b/src/balance.cpp
@@ -12,6 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include "mpi.h"
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
diff --git a/src/lattice.cpp b/src/lattice.cpp
index 196074deb8..1eac7d2da2 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -175,7 +175,8 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
     } else if (strcmp(arg[iarg],"a1") == 0) {
       if (iarg+4 > narg) error->all(FLERR,"Illegal lattice command");
       if (style != CUSTOM) 
-	error->all(FLERR,"Invalid option in lattice command for non-custom style");
+	error->all(FLERR,
+		   "Invalid option in lattice command for non-custom style");
       a1[0] = atof(arg[iarg+1]);
       a1[1] = atof(arg[iarg+2]);
       a1[2] = atof(arg[iarg+3]);
@@ -183,7 +184,8 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
     } else if (strcmp(arg[iarg],"a2") == 0) {
       if (iarg+4 > narg) error->all(FLERR,"Illegal lattice command");
       if (style != CUSTOM) 
-	error->all(FLERR,"Invalid option in lattice command for non-custom style");
+	error->all(FLERR,
+		   "Invalid option in lattice command for non-custom style");
       a2[0] = atof(arg[iarg+1]);
       a2[1] = atof(arg[iarg+2]);
       a2[2] = atof(arg[iarg+3]);
@@ -191,7 +193,8 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
     } else if (strcmp(arg[iarg],"a3") == 0) {
       if (iarg+4 > narg) error->all(FLERR,"Illegal lattice command");
       if (style != CUSTOM) 
-	error->all(FLERR,"Invalid option in lattice command for non-custom style");
+	error->all(FLERR,
+		   "Invalid option in lattice command for non-custom style");
       a3[0] = atof(arg[iarg+1]);
       a3[1] = atof(arg[iarg+2]);
       a3[2] = atof(arg[iarg+3]);
@@ -200,7 +203,8 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
     } else if (strcmp(arg[iarg],"basis") == 0) {
       if (iarg+4 > narg) error->all(FLERR,"Illegal lattice command");
       if (style != CUSTOM) 
-	error->all(FLERR,"Invalid option in lattice command for non-custom style");
+	error->all(FLERR,
+		   "Invalid option in lattice command for non-custom style");
       double x = atof(arg[iarg+1]);
       double y = atof(arg[iarg+2]);
       double z = atof(arg[iarg+3]);
@@ -223,12 +227,15 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
 
   if (dimension == 2) {
     if (origin[2] != 0.0)
-      error->all(FLERR,"Lattice settings are not compatible with 2d simulation");
+      error->all(FLERR,
+		 "Lattice settings are not compatible with 2d simulation");
     if (orientx[2] != 0 || orienty[2] != 0 || 
 	orientz[0] != 0 || orientz[1] != 0)
-      error->all(FLERR,"Lattice settings are not compatible with 2d simulation");
+      error->all(FLERR,
+		 "Lattice settings are not compatible with 2d simulation");
     if (a1[2] != 0.0 || a2[2] != 0.0 || a3[0] != 0.0 || a3[1] != 0.0)
-      error->all(FLERR,"Lattice settings are not compatible with 2d simulation");
+      error->all(FLERR,
+		 "Lattice settings are not compatible with 2d simulation");
   }
 
   if (spaceflag) {