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

12
src/fix_controller.cpp
View File

@ -43,13 +43,13 @@ FixController::FixController(LAMMPS *lmp, int narg, char **arg) :
global_freq = 1;
extvector = 0;
nevery = force->inumeric(FLERR,arg[3]);
nevery = utils::inumeric(FLERR,arg[3],false,lmp);
if (nevery <= 0) error->all(FLERR,"Illegal fix controller command");
alpha = force->numeric(FLERR,arg[4]);
kp = force->numeric(FLERR,arg[5]);
ki = force->numeric(FLERR,arg[6]);
kd = force->numeric(FLERR,arg[7]);
alpha = utils::numeric(FLERR,arg[4],false,lmp);
kp = utils::numeric(FLERR,arg[5],false,lmp);
ki = utils::numeric(FLERR,arg[6],false,lmp);
kd = utils::numeric(FLERR,arg[7],false,lmp);
// process variable arg
@ -84,7 +84,7 @@ FixController::FixController(LAMMPS *lmp, int narg, char **arg) :
// setpoint arg
setpoint = force->numeric(FLERR,arg[iarg]);
setpoint = utils::numeric(FLERR,arg[iarg],false,lmp);
iarg++;
// control variable arg