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@2543 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2009-01-29 14:56:43 +00:00
parent eccb3ec8db
commit 1a510caccb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/restart2data.cpp
View File

@ -1558,7 +1558,8 @@ void pair(FILE *fp, Data &data, char *style, int flag)
double cut_coul = read_double(fp); double cut_coul = read_double(fp);
int offset_flag = read_int(fp); int offset_flag = read_int(fp);
int mix_flag = read_int(fp); int mix_flag = read_int(fp);
} else if (strcmp(style,"lj/charmm/coul/long") == 0) { } else if ((strcmp(style,"lj/charmm/coul/long") == 0) ||
(strcmp(style,"lj/charmm/coul/long/opt") == 0)) {
double cut_lj_inner = read_double(fp); double cut_lj_inner = read_double(fp);
double cut_lj = read_double(fp); double cut_lj = read_double(fp);
double cut_coul = read_double(fp); double cut_coul = read_double(fp);
@ -1653,7 +1654,7 @@ void pair(FILE *fp, Data &data, char *style, int flag)
(strcmp(style,"lj/cut/coul/long/tip4p") == 0) || (strcmp(style,"lj/cut/coul/long/tip4p") == 0) ||
(strcmp(style,"lj/coul") == 0)) { (strcmp(style,"lj/coul") == 0)) {
if (strcmp(style,"lj/cut") == 0) { if ((strcmp(style,"lj/cut") == 0) || (strcmp(style,"lj/cut/opt") == 0)) {
m = 0; m = 0;
double cut_lj_global = read_double(fp); double cut_lj_global = read_double(fp);
int offset_flag = read_int(fp); int offset_flag = read_int(fp);