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

This commit is contained in:
sjplimp
2007-01-30 15:56:54 +00:00
parent b6423c6183
commit b17d4fc4b9
4 changed files with 9 additions and 13 deletions

View File

@ -157,11 +157,11 @@ Pair *Force::new_pair(char *style)
Pair *Force::pair_match(char *word)
{
if (strstr(pair_style,word) == 0) return pair;
if (strstr(pair_style,word)) return pair;
else if (strcmp(pair_style,"hybrid") == 0) {
PairHybrid *pair_hybrid = (PairHybrid *) pair;
for (int i = 0; i < pair_hybrid->nstyles; i++)
if (strstr(pair_hybrid->keywords[i],word) == 0)
if (strstr(pair_hybrid->keywords[i],word))
return pair_hybrid->styles[i];
}
return NULL;