diff -Naur lammps-20Nov08/src/USER-ACKLAND/README lammps-21Nov08/src/USER-ACKLAND/README --- lammps-20Nov08/src/USER-ACKLAND/README 2007-10-03 10:28:14.000000000 -0600 +++ lammps-21Nov08/src/USER-ACKLAND/README 2008-11-21 09:22:54.000000000 -0700 @@ -16,3 +16,11 @@ The output is a number with the following mapping: enum{UNKNOWN,BCC,FCC,HCP,ICO}; + +or in other words: + +0 == UNKNOWN +1 == BCC +2 == FCC +3 == HCP +4 == ICO diff -Naur lammps-20Nov08/src/lammps.cpp lammps-21Nov08/src/lammps.cpp --- lammps-20Nov08/src/lammps.cpp 2008-01-17 10:01:57.000000000 -0700 +++ lammps-21Nov08/src/lammps.cpp 2008-11-21 09:22:43.000000000 -0700 @@ -55,7 +55,7 @@ while (iarg < narg) { if (strcmp(arg[iarg],"-partition") == 0) { - if (iarg+1 > narg) + if (iarg+2 > narg) error->universe_all("Invalid command-line argument"); iarg++; while (iarg < narg && arg[iarg][0] != '-') { diff -Naur lammps-20Nov08/src/pair_hybrid.cpp lammps-21Nov08/src/pair_hybrid.cpp --- lammps-20Nov08/src/pair_hybrid.cpp 2008-08-13 08:39:45.000000000 -0600 +++ lammps-21Nov08/src/pair_hybrid.cpp 2008-11-21 09:22:04.000000000 -0700 @@ -211,6 +211,8 @@ // allocate each sub-style and call its settings() with subset of args // define subset of args for a sub-style by skipping numeric args // one exception is 1st arg of style "table", which is non-numeric word + // one exception is 1st two args of style "lj/coul", which are non-numeric + // need a better way to skip these exceptions nstyles = 0; i = 0; @@ -227,6 +229,7 @@ strcpy(keywords[nstyles],arg[i]); istyle = i; if (strcmp(arg[i],"table") == 0) i++; + if (strcmp(arg[i],"lj/coul") == 0) i += 2; i++; while (i < narg && !isalpha(arg[i][0])) i++; styles[nstyles]->settings(i-istyle-1,&arg[istyle+1]);