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

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

View File

@ -71,14 +71,14 @@ ComputeTempRamp::ComputeTempRamp(LAMMPS *lmp, int narg, char **arg) :
else error->all(FLERR,"Illegal compute temp/ramp command");
if (v_dim == 0) {
v_lo = xscale*force->numeric(FLERR,arg[4]);
v_hi = xscale*force->numeric(FLERR,arg[5]);
v_lo = xscale*utils::numeric(FLERR,arg[4],false,lmp);
v_hi = xscale*utils::numeric(FLERR,arg[5],false,lmp);
} else if (v_dim == 1) {
v_lo = yscale*force->numeric(FLERR,arg[4]);
v_hi = yscale*force->numeric(FLERR,arg[5]);
v_lo = yscale*utils::numeric(FLERR,arg[4],false,lmp);
v_hi = yscale*utils::numeric(FLERR,arg[5],false,lmp);
} else if (v_dim == 2) {
v_lo = zscale*force->numeric(FLERR,arg[4]);
v_hi = zscale*force->numeric(FLERR,arg[5]);
v_lo = zscale*utils::numeric(FLERR,arg[4],false,lmp);
v_hi = zscale*utils::numeric(FLERR,arg[5],false,lmp);
}
if (strcmp(arg[6],"x") == 0) coord_dim = 0;
@ -87,14 +87,14 @@ ComputeTempRamp::ComputeTempRamp(LAMMPS *lmp, int narg, char **arg) :
else error->all(FLERR,"Illegal compute temp/ramp command");
if (coord_dim == 0) {
coord_lo = xscale*force->numeric(FLERR,arg[7]);
coord_hi = xscale*force->numeric(FLERR,arg[8]);
coord_lo = xscale*utils::numeric(FLERR,arg[7],false,lmp);
coord_hi = xscale*utils::numeric(FLERR,arg[8],false,lmp);
} else if (coord_dim == 1) {
coord_lo = yscale*force->numeric(FLERR,arg[7]);
coord_hi = yscale*force->numeric(FLERR,arg[8]);
coord_lo = yscale*utils::numeric(FLERR,arg[7],false,lmp);
coord_hi = yscale*utils::numeric(FLERR,arg[8],false,lmp);
} else if (coord_dim == 2) {
coord_lo = zscale*force->numeric(FLERR,arg[7]);
coord_hi = zscale*force->numeric(FLERR,arg[8]);
coord_lo = zscale*utils::numeric(FLERR,arg[7],false,lmp);
coord_hi = zscale*utils::numeric(FLERR,arg[8],false,lmp);
}
maxbias = 0;