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

This commit is contained in:
sjplimp
2011-09-23 18:06:55 +00:00
parent 2d99de131d
commit 19e8c92a90
468 changed files with 4628 additions and 5204 deletions

View File

@ -267,7 +267,7 @@ void AngleClass2::allocate()
void AngleClass2::coeff(int narg, char **arg)
{
if (narg < 2) error->all("Incorrect args for angle coefficients");
if (narg < 2) error->all(FLERR,"Incorrect args for angle coefficients");
if (!allocated) allocate();
int ilo,ihi;
@ -276,7 +276,7 @@ void AngleClass2::coeff(int narg, char **arg)
int count = 0;
if (strcmp(arg[1],"bb") == 0) {
if (narg != 5) error->all("Incorrect args for angle coefficients");
if (narg != 5) error->all(FLERR,"Incorrect args for angle coefficients");
double bb_k_one = force->numeric(arg[2]);
double bb_r1_one = force->numeric(arg[3]);
@ -291,7 +291,7 @@ void AngleClass2::coeff(int narg, char **arg)
}
} else if (strcmp(arg[1],"ba") == 0) {
if (narg != 6) error->all("Incorrect args for angle coefficients");
if (narg != 6) error->all(FLERR,"Incorrect args for angle coefficients");
double ba_k1_one = force->numeric(arg[2]);
double ba_k2_one = force->numeric(arg[3]);
@ -308,7 +308,7 @@ void AngleClass2::coeff(int narg, char **arg)
}
} else {
if (narg != 5) error->all("Incorrect args for angle coefficients");
if (narg != 5) error->all(FLERR,"Incorrect args for angle coefficients");
double theta0_one = force->numeric(arg[1]);
double k2_one = force->numeric(arg[2]);
@ -327,7 +327,7 @@ void AngleClass2::coeff(int narg, char **arg)
}
}
if (count == 0) error->all("Incorrect args for angle coefficients");
if (count == 0) error->all(FLERR,"Incorrect args for angle coefficients");
for (int i = ilo; i <= ihi; i++)
if (setflag_a[i] == 1 && setflag_bb[i] == 1 && setflag_ba[i] == 1)