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

This commit is contained in:
sjplimp
2013-06-27 20:02:55 +00:00
parent 0d6f0c69fd
commit 2dbe3f80a2
121 changed files with 588 additions and 585 deletions

View File

@ -284,12 +284,12 @@ void ImproperFourier::coeff(int narg, char **arg)
int ilo,ihi;
force->bounds(arg[0],atom->nimpropertypes,ilo,ihi);
double k_one = force->numeric(arg[1]);
double C0_one = force->numeric(arg[2]);
double C1_one = force->numeric(arg[3]);
double C2_one = force->numeric(arg[4]);
double k_one = force->numeric(FLERR,arg[1]);
double C0_one = force->numeric(FLERR,arg[2]);
double C1_one = force->numeric(FLERR,arg[3]);
double C2_one = force->numeric(FLERR,arg[4]);
int all_one = 1;
if ( narg == 6 ) all_one = force->inumeric(arg[5]);
if ( narg == 6 ) all_one = force->inumeric(FLERR,arg[5]);
// convert w0 from degrees to radians