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/compute_orientorder_atom.cpp
View File

@ -85,7 +85,7 @@ ComputeOrientOrderAtom::ComputeOrientOrderAtom(LAMMPS *lmp, int narg, char **arg
if (strcmp(arg[iarg+1],"NULL") == 0) {
nnn = 0;
} else {
nnn = force->numeric(FLERR,arg[iarg+1]);
nnn = utils::numeric(FLERR,arg[iarg+1],false,lmp);
if (nnn <= 0)
error->all(FLERR,"Illegal compute orientorder/atom command");
}
@ -93,7 +93,7 @@ ComputeOrientOrderAtom::ComputeOrientOrderAtom(LAMMPS *lmp, int narg, char **arg
} else if (strcmp(arg[iarg],"degrees") == 0) {
if (iarg+2 > narg)
error->all(FLERR,"Illegal compute orientorder/atom command");
nqlist = force->numeric(FLERR,arg[iarg+1]);
nqlist = utils::numeric(FLERR,arg[iarg+1],false,lmp);
if (nqlist <= 0)
error->all(FLERR,"Illegal compute orientorder/atom command");
memory->destroy(qlist);
@ -103,7 +103,7 @@ ComputeOrientOrderAtom::ComputeOrientOrderAtom(LAMMPS *lmp, int narg, char **arg
error->all(FLERR,"Illegal compute orientorder/atom command");
qmax = 0;
for (int il = 0; il < nqlist; il++) {
qlist[il] = force->numeric(FLERR,arg[iarg+il]);
qlist[il] = utils::numeric(FLERR,arg[iarg+il],false,lmp);
if (qlist[il] < 0)
error->all(FLERR,"Illegal compute orientorder/atom command");
if (qlist[il] > qmax) qmax = qlist[il];
@ -127,7 +127,7 @@ ComputeOrientOrderAtom::ComputeOrientOrderAtom(LAMMPS *lmp, int narg, char **arg
qlcompflag = 1;
if (iarg+2 > narg)
error->all(FLERR,"Illegal compute orientorder/atom command");
qlcomp = force->numeric(FLERR,arg[iarg+1]);
qlcomp = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iqlcomp = -1;
for (int il = 0; il < nqlist; il++)
if (qlcomp == qlist[il]) {
@ -140,7 +140,7 @@ ComputeOrientOrderAtom::ComputeOrientOrderAtom(LAMMPS *lmp, int narg, char **arg
} else if (strcmp(arg[iarg],"cutoff") == 0) {
if (iarg+2 > narg)
error->all(FLERR,"Illegal compute orientorder/atom command");
double cutoff = force->numeric(FLERR,arg[iarg+1]);
double cutoff = utils::numeric(FLERR,arg[iarg+1],false,lmp);
if (cutoff <= 0.0)
error->all(FLERR,"Illegal compute orientorder/atom command");
cutsq = cutoff*cutoff;
@ -148,7 +148,7 @@ ComputeOrientOrderAtom::ComputeOrientOrderAtom(LAMMPS *lmp, int narg, char **arg
} else if (strcmp(arg[iarg],"chunksize") == 0) {
if (iarg+2 > narg)
error->all(FLERR,"Illegal compute orientorder/atom command");
chunksize = force->numeric(FLERR,arg[iarg+1]);
chunksize = utils::numeric(FLERR,arg[iarg+1],false,lmp);
if (chunksize <= 0)
error->all(FLERR,"Illegal compute orientorder/atom command");
iarg += 2;