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

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

Browse Source
This commit is contained in:
sjplimp
2011-12-16 21:15:49 +00:00
parent 70316a8f77
commit 4f48544d41
61 changed files with 108 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pair_table.cpp
View File

@ -947,7 +947,7 @@ double PairTable::single(int i, int j, int itype, int jtype, double rsq,
no way to know which tables are active since pair::init() not yet called
------------------------------------------------------------------------- */
void *PairTable::extract(char *str, int &dim)
void *PairTable::extract(const char *str, int &dim)
{
if (strcmp(str,"cut_coul") != 0) return NULL;
if (ntables == 0) error->all(FLERR,"All pair coeffs are not set");
@ -955,7 +955,8 @@ void *PairTable::extract(char *str, int &dim)
double cut_coul = tables[0].cut;
for (int m = 1; m < ntables; m++)
if (tables[m].cut != cut_coul)
error->all(FLERR,"Pair table cutoffs must all be equal to use with KSpace");
error->all(FLERR,
"Pair table cutoffs must all be equal to use with KSpace");
dim = 0;
return &tables[0].cut;
}