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

28
src/fix_move.cpp
View File

@ -75,17 +75,17 @@ FixMove::FixMove(LAMMPS *lmp, int narg, char **arg) :
if (strcmp(arg[4],"NULL") == 0) vxflag = 0;
else {
vxflag = 1;
vx = force->numeric(FLERR,arg[4]);
vx = utils::numeric(FLERR,arg[4],false,lmp);
}
if (strcmp(arg[5],"NULL") == 0) vyflag = 0;
else {
vyflag = 1;
vy = force->numeric(FLERR,arg[5]);
vy = utils::numeric(FLERR,arg[5],false,lmp);
}
if (strcmp(arg[6],"NULL") == 0) vzflag = 0;
else {
vzflag = 1;
vz = force->numeric(FLERR,arg[6]);
vz = utils::numeric(FLERR,arg[6],false,lmp);
}
} else if (strcmp(arg[3],"wiggle") == 0) {
@ -95,32 +95,32 @@ FixMove::FixMove(LAMMPS *lmp, int narg, char **arg) :
if (strcmp(arg[4],"NULL") == 0) axflag = 0;
else {
axflag = 1;
ax = force->numeric(FLERR,arg[4]);
ax = utils::numeric(FLERR,arg[4],false,lmp);
}
if (strcmp(arg[5],"NULL") == 0) ayflag = 0;
else {
ayflag = 1;
ay = force->numeric(FLERR,arg[5]);
ay = utils::numeric(FLERR,arg[5],false,lmp);
}
if (strcmp(arg[6],"NULL") == 0) azflag = 0;
else {
azflag = 1;
az = force->numeric(FLERR,arg[6]);
az = utils::numeric(FLERR,arg[6],false,lmp);
}
period = force->numeric(FLERR,arg[7]);
period = utils::numeric(FLERR,arg[7],false,lmp);
if (period <= 0.0) error->all(FLERR,"Illegal fix move command");
} else if (strcmp(arg[3],"rotate") == 0) {
if (narg < 11) error->all(FLERR,"Illegal fix move command");
iarg = 11;
mstyle = ROTATE;
point[0] = force->numeric(FLERR,arg[4]);
point[1] = force->numeric(FLERR,arg[5]);
point[2] = force->numeric(FLERR,arg[6]);
axis[0] = force->numeric(FLERR,arg[7]);
axis[1] = force->numeric(FLERR,arg[8]);
axis[2] = force->numeric(FLERR,arg[9]);
period = force->numeric(FLERR,arg[10]);
point[0] = utils::numeric(FLERR,arg[4],false,lmp);
point[1] = utils::numeric(FLERR,arg[5],false,lmp);
point[2] = utils::numeric(FLERR,arg[6],false,lmp);
axis[0] = utils::numeric(FLERR,arg[7],false,lmp);
axis[1] = utils::numeric(FLERR,arg[8],false,lmp);
axis[2] = utils::numeric(FLERR,arg[9],false,lmp);
period = utils::numeric(FLERR,arg[10],false,lmp);
if (period <= 0.0) error->all(FLERR,"Illegal fix move command");
} else if (strcmp(arg[3],"variable") == 0) {