From a4eff9cc14b17004de32d737b1f989d9896d213e Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 15 May 2008 23:58:17 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1828
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/compute_group_group.cpp |  3 ++-
 src/kspace.cpp              |  5 +++--
 src/style_meam.h            | 20 ++++++++++++++++++++
 src/style_poems.h           | 20 ++++++++++++++++++++
 src/style_user_ackland.h    | 20 --------------------
 src/style_user_ewaldn.h     | 30 ------------------------------
 6 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/src/compute_group_group.cpp b/src/compute_group_group.cpp
index 82d7de4f64..f5d42f09ce 100644
--- a/src/compute_group_group.cpp
+++ b/src/compute_group_group.cpp
@@ -61,7 +61,8 @@ ComputeGroupGroup::~ComputeGroupGroup()
 
 void ComputeGroupGroup::init()
 {
-  if (force->pair == NULL) error->all("Bad");
+  if (force->pair == NULL)
+    error->all("Compute group/group requires pair style be defined");
   pair = force->pair;
   cutsq = force->pair->cutsq;
 
diff --git a/src/kspace.cpp b/src/kspace.cpp
index 8f25b718f2..fd4d353d6c 100644
--- a/src/kspace.cpp
+++ b/src/kspace.cpp
@@ -61,9 +61,10 @@ void KSpace::modify_params(int narg, char **arg)
       if (iarg+2 > narg) error->all("Illegal kspace_modify command");
       slab_volfactor = atof(arg[iarg+1]);
       iarg += 2;
-      if (slab_volfactor <= 1.0) error->all("Bad slab parameter");
+      if (slab_volfactor <= 1.0)
+	error->all("Bad kspace_modify slab parameter");
       if (slab_volfactor < 2.0 && comm->me == 0) 
-	error->warning("Slab parameter < 2.0 may cause unphysical behavior");
+	error->warning("Kspace_modify slab param < 2.0 may cause unphysical behavior");
       slabflag = 1;
     } else error->all("Illegal kspace_modify command");
   }
diff --git a/src/style_meam.h b/src/style_meam.h
index e69de29bb2..221a363f11 100644
--- a/src/style_meam.h
+++ b/src/style_meam.h
@@ -0,0 +1,20 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under 
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifdef PairInclude
+#include "pair_meam.h"
+#endif
+
+#ifdef PairClass
+PairStyle(meam,PairMEAM)
+#endif
diff --git a/src/style_poems.h b/src/style_poems.h
index e69de29bb2..0434d02bf8 100644
--- a/src/style_poems.h
+++ b/src/style_poems.h
@@ -0,0 +1,20 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under 
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifdef FixInclude
+#include "fix_poems.h"
+#endif
+
+#ifdef FixClass
+FixStyle(poems,FixPOEMS)
+#endif
diff --git a/src/style_user_ackland.h b/src/style_user_ackland.h
index 6e7483a9f7..e69de29bb2 100644
--- a/src/style_user_ackland.h
+++ b/src/style_user_ackland.h
@@ -1,20 +0,0 @@
-/* ----------------------------------------------------------------------
-   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   http://lammps.sandia.gov, Sandia National Laboratories
-   Steve Plimpton, sjplimp@sandia.gov
-
-   Copyright (2003) Sandia Corporation.  Under the terms of Contract
-   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
-   certain rights in this software.  This software is distributed under 
-   the GNU General Public License.
-
-   See the README file in the top-level LAMMPS directory.
-------------------------------------------------------------------------- */
-
-#ifdef ComputeInclude
-#include "compute_ackland_atom.h"
-#endif
-
-#ifdef ComputeClass
-ComputeStyle(ackland/atom,ComputeAcklandAtom)
-#endif
diff --git a/src/style_user_ewaldn.h b/src/style_user_ewaldn.h
index 3eafa50744..e69de29bb2 100644
--- a/src/style_user_ewaldn.h
+++ b/src/style_user_ewaldn.h
@@ -1,30 +0,0 @@
-/* ----------------------------------------------------------------------
-   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   http://lammps.sandia.gov, Sandia National Laboratories
-   Steve Plimpton, sjplimp@sandia.gov
-
-   Copyright (2003) Sandia Corporation.  Under the terms of Contract
-   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
-   certain rights in this software.  This software is distributed under 
-   the GNU General Public License.
-
-   See the README file in the top-level LAMMPS directory.
-------------------------------------------------------------------------- */
-
-#ifdef KSpaceInclude
-#include "ewald_n.h"
-#endif
-
-#ifdef KSpaceClass
-KSpaceStyle(ewald/n,EwaldN)
-#endif
-
-#ifdef PairInclude
-#include "pair_buck_coul.h"
-#include "pair_lj_coul.h"
-#endif
-
-#ifdef PairClass
-PairStyle(buck/coul,PairBuckCoul)
-PairStyle(lj/coul,PairLJCoul)
-#endif