From ef4e8f288aa4abf15472c861e76e1fe725f82078 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 24 Sep 2015 20:57:49 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14071
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/pair_lj_cut_coul_dsf.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pair_lj_cut_coul_dsf.cpp b/src/pair_lj_cut_coul_dsf.cpp
index 448bff34cd..af8064a131 100644
--- a/src/pair_lj_cut_coul_dsf.cpp
+++ b/src/pair_lj_cut_coul_dsf.cpp
@@ -212,11 +212,12 @@ void PairLJCutCoulDSF::allocate()
 
 void PairLJCutCoulDSF::settings(int narg, char **arg)
 {
-  if (narg != 3) error->all(FLERR,"Illegal pair_style command");
+  if (narg < 2 || narg > 3) error->all(FLERR,"Illegal pair_style command");
 
   alpha = force->numeric(FLERR,arg[0]);
   cut_lj_global = force->numeric(FLERR,arg[1]);
-  cut_coul = force->numeric(FLERR,arg[2]);
+  if (narg == 2) cut_coul = cut_lj_global;
+  else cut_coul = force->numeric(FLERR,arg[2]);
   
   // reset cutoffs that have been explicitly set