From 70fbc16e7da806406adf32562299beedc8140597 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Wed, 6 Mar 2013 17:42:05 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9595 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/KSPACE/pair_lj_long_coul_long.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/KSPACE/pair_lj_long_coul_long.cpp b/src/KSPACE/pair_lj_long_coul_long.cpp index d09e897a74..25782382fd 100644 --- a/src/KSPACE/pair_lj_long_coul_long.cpp +++ b/src/KSPACE/pair_lj_long_coul_long.cpp @@ -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;