git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6767 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2011-08-23 21:12:28 +00:00
parent 541c47f4d4
commit e77ec4dea6
16 changed files with 36 additions and 23 deletions
--- a/src/GPU/pair_morse_gpu.cpp
+++ b/src/GPU/pair_morse_gpu.cpp
@ -125,7 +125,7 @@ void PairMorseGPU::compute(int eflag, int vflag)
 void PairMorseGPU::init_style()
 {
  if (force->newton_pair) 
-    error->all("Cannot use newton pair with GPU Morse pair style");
+    error->all("Cannot use newton pair with morse/gpu pair style");

  // Repeat cutsq calculation because done after call to init_style
  double maxcut = -1.0;