lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2013-03-06 17:42:05 +00:00
parent a5e982730c
commit 70fbc16e7d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/KSPACE/pair_lj_long_coul_long.cpp
View File

@ -91,8 +91,9 @@ void PairLJLongCoulLong::settings(int narg, char **arg)
if (!*(++arg))
error->all(FLERR,"Cut-offs missing in pair_style lj/coul");
if (!((ewald_order^ewald_off) & (1<<1)))
error->all(FLERR,"Coulombic cut not supported in pair_style lj/coul"); cut_lj_global = force->numeric(*(arg++));
if (*arg && ((ewald_order & 0x42) == 0x42))
error->all(FLERR,"Coulombic cut not supported in pair_style lj/coul");
cut_lj_global = force->numeric(*(arg++));
if (narg == 4 && ((ewald_order & 0x42) == 0x42))
error->all(FLERR,"Only one cut-off allowed when requesting all long");
if (narg == 4) cut_coul = force->numeric(*arg);
else cut_coul = cut_lj_global;