ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace calls to force->*numeric() with the corresponding utils::*numeric()

Browse Source 
this also removes the now obsolete functions from Force
This commit is contained in:
Axel Kohlmeyer
2020-08-29 19:32:03 -04:00
parent 27b4e93bf5
commit 96d8d12a88
506 changed files with 3042 additions and 3135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/CLASS2/angle_class2.cpp
View File

@ -280,9 +280,9 @@ void AngleClass2::coeff(int narg, char **arg)
if (strcmp(arg[1],"bb") == 0) {
if (narg != 5) error->all(FLERR,"Incorrect args for angle coefficients");
double bb_k_one = force->numeric(FLERR,arg[2]);
double bb_r1_one = force->numeric(FLERR,arg[3]);
double bb_r2_one = force->numeric(FLERR,arg[4]);
double bb_k_one = utils::numeric(FLERR,arg[2],false,lmp);
double bb_r1_one = utils::numeric(FLERR,arg[3],false,lmp);
double bb_r2_one = utils::numeric(FLERR,arg[4],false,lmp);
for (int i = ilo; i <= ihi; i++) {
bb_k[i] = bb_k_one;
@ -295,10 +295,10 @@ void AngleClass2::coeff(int narg, char **arg)
} else if (strcmp(arg[1],"ba") == 0) {
if (narg != 6) error->all(FLERR,"Incorrect args for angle coefficients");
double ba_k1_one = force->numeric(FLERR,arg[2]);
double ba_k2_one = force->numeric(FLERR,arg[3]);
double ba_r1_one = force->numeric(FLERR,arg[4]);
double ba_r2_one = force->numeric(FLERR,arg[5]);
double ba_k1_one = utils::numeric(FLERR,arg[2],false,lmp);
double ba_k2_one = utils::numeric(FLERR,arg[3],false,lmp);
double ba_r1_one = utils::numeric(FLERR,arg[4],false,lmp);
double ba_r2_one = utils::numeric(FLERR,arg[5],false,lmp);
for (int i = ilo; i <= ihi; i++) {
ba_k1[i] = ba_k1_one;
@ -312,10 +312,10 @@ void AngleClass2::coeff(int narg, char **arg)
} else {
if (narg != 5) error->all(FLERR,"Incorrect args for angle coefficients");
double theta0_one = force->numeric(FLERR,arg[1]);
double k2_one = force->numeric(FLERR,arg[2]);
double k3_one = force->numeric(FLERR,arg[3]);
double k4_one = force->numeric(FLERR,arg[4]);
double theta0_one = utils::numeric(FLERR,arg[1],false,lmp);
double k2_one = utils::numeric(FLERR,arg[2],false,lmp);
double k3_one = utils::numeric(FLERR,arg[3],false,lmp);
double k4_one = utils::numeric(FLERR,arg[4],false,lmp);
// convert theta0 from degrees to radians