forked from lijiext/lammps
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5542 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
parent
c837659cdb
commit
11e80405e1
|
@ -1647,6 +1647,7 @@ void pair(FILE *fp, Data &data, char *style, int flag)
|
|||
} else if ((strcmp(style,"lj/charmm/coul/charmm") == 0) ||
|
||||
(strcmp(style,"lj/charmm/coul/charmm/implicit") == 0) ||
|
||||
(strcmp(style,"lj/charmm/coul/long") == 0) ||
|
||||
(strcmp(style,"lj/charmm/coul/long/gpu") == 0) ||
|
||||
(strcmp(style,"lj/charmm/coul/long/opt") == 0)) {
|
||||
|
||||
if (strcmp(style,"lj/charmm/coul/charmm") == 0) {
|
||||
|
@ -1664,6 +1665,7 @@ void pair(FILE *fp, Data &data, char *style, int flag)
|
|||
int offset_flag = read_int(fp);
|
||||
int mix_flag = read_int(fp);
|
||||
} else if ((strcmp(style,"lj/charmm/coul/long") == 0) ||
|
||||
(strcmp(style,"lj/charmm/coul/long/gpu") == 0) ||
|
||||
(strcmp(style,"lj/charmm/coul/long/opt") == 0)) {
|
||||
double cut_lj_inner = read_double(fp);
|
||||
double cut_lj = read_double(fp);
|
||||
|
|
Loading…
Reference in New Issue