ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix to allow table keywords to be subsets of other table keywords. This is an issue pointed to by Andrew Jewett on Sept 6, 2012, and fixed with this change.

Browse Source 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8753 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
pscrozi
2012-09-07 15:12:39 +00:00
parent 23949bbeb6
commit b60290258d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pair_table.cpp
View File

@ -19,6 +19,7 @@
#include "math.h" #include "math.h"
#include "stdlib.h" #include "stdlib.h"
#include "string.h" #include "string.h"
#include "ctype.h"
#include "pair_table.h" #include "pair_table.h"
#include "atom.h" #include "atom.h"
#include "force.h" #include "force.h"
@ -343,7 +344,11 @@ void PairTable::read_table(Table *tb, char *file, char *keyword)
error->one(FLERR,"Did not find keyword in table file"); error->one(FLERR,"Did not find keyword in table file");
if (strspn(line," \t\n\r") == strlen(line)) continue; // blank line if (strspn(line," \t\n\r") == strlen(line)) continue; // blank line
if (line[0] == '#') continue; // comment if (line[0] == '#') continue; // comment
if (strstr(line,keyword) == line) break; // matching keyword int i = 0;
while (isalnum(line[i]) || line[i] == '_') i++;
char *word = new char[i];
strncpy(word,&line[0],i);
if (strcmp(word,keyword) == 0) break; // matching keyword
fgets(line,MAXLINE,fp); // no match, skip section fgets(line,MAXLINE,fp); // no match, skip section
param_extract(tb,line); param_extract(tb,line);
fgets(line,MAXLINE,fp); fgets(line,MAXLINE,fp);