mirror of https://github.com/lammps/lammps.git
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1825 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
parent
71e56ccae2
commit
82458347c0
|
@ -700,7 +700,7 @@ int atom(double *buf, Data &data)
|
|||
if (data.style_molecular) allocate_molecular(data);
|
||||
}
|
||||
|
||||
// read atom quatities from buf
|
||||
// read atom quantities from buf
|
||||
// if hybrid, loop over all sub-styles in order listed
|
||||
// if hybrid, loop index k will match style setting to insure correct order
|
||||
|
||||
|
@ -1912,7 +1912,10 @@ void pair(FILE *fp, Data &data, char *style, int flag)
|
|||
data.pair_cg_epsilon[i][j] = read_double(fp);
|
||||
data.pair_cg_sigma[i][j] = read_double(fp);
|
||||
data.pair_cut_lj[i][j] = read_double(fp);
|
||||
if (m) data.pair_cut_coul[i][j] = read_double(fp);
|
||||
if (m) {
|
||||
data.pair_cut_lj[i][j] = read_double(fp);
|
||||
data.pair_cut_coul[i][j] = read_double(fp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue