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

This commit is contained in:
sjplimp
2008-11-21 16:22:04 +00:00
parent f651d96363
commit e77b2352a8

View File

@ -211,6 +211,8 @@ void PairHybrid::settings(int narg, char **arg)
// allocate each sub-style and call its settings() with subset of args // allocate each sub-style and call its settings() with subset of args
// define subset of args for a sub-style by skipping numeric 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 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; nstyles = 0;
i = 0; i = 0;
@ -227,6 +229,7 @@ void PairHybrid::settings(int narg, char **arg)
strcpy(keywords[nstyles],arg[i]); strcpy(keywords[nstyles],arg[i]);
istyle = i; istyle = i;
if (strcmp(arg[i],"table") == 0) i++; if (strcmp(arg[i],"table") == 0) i++;
if (strcmp(arg[i],"lj/coul") == 0) i += 2;
i++; i++;
while (i < narg && !isalpha(arg[i][0])) i++; while (i < narg && !isalpha(arg[i][0])) i++;
styles[nstyles]->settings(i-istyle-1,&arg[istyle+1]); styles[nstyles]->settings(i-istyle-1,&arg[istyle+1]);