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

This commit is contained in:
sjplimp
2009-08-12 16:46:29 +00:00
parent 323fb937c3
commit bd0d78aeac
7 changed files with 104 additions and 78 deletions

View File

@ -194,6 +194,7 @@ void PairHybrid::settings(int narg, char **arg)
// count sub-styles 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
// one exception is 1st two args of style "lj/coul", which are non-numeric
// need a better way to skip these exceptions
nstyles = 0;
@ -213,8 +214,9 @@ void PairHybrid::settings(int narg, char **arg)
// 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 arg of style "table", which is non-numeric
// one exception is 1st two args of style "lj/coul", which are non-numeric
// one exception is 1st arg of any "gpu" style, which is non-numeric
// need a better way to skip these exceptions
nstyles = 0;
@ -233,6 +235,7 @@ void PairHybrid::settings(int narg, char **arg)
istyle = i;
if (strcmp(arg[i],"table") == 0) i++;
if (strcmp(arg[i],"lj/coul") == 0) i += 2;
if (strstr(arg[i],"gpu")) i++;
i++;
while (i < narg && !isalpha(arg[i][0])) i++;
styles[nstyles]->settings(i-istyle-1,&arg[istyle+1]);