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

18
src/min.cpp
View File

@ -671,35 +671,35 @@ void Min::modify_params(int narg, char **arg)
while (iarg < narg) {
if (strcmp(arg[iarg],"dmax") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
dmax = force->numeric(FLERR,arg[iarg+1]);
dmax = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"delaystep") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
delaystep = force->numeric(FLERR,arg[iarg+1]);
delaystep = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"dtgrow") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
dtgrow = force->numeric(FLERR,arg[iarg+1]);
dtgrow = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"dtshrink") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
dtshrink = force->numeric(FLERR,arg[iarg+1]);
dtshrink = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"alpha0") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
alpha0 = force->numeric(FLERR,arg[iarg+1]);
alpha0 = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"alphashrink") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
alphashrink = force->numeric(FLERR,arg[iarg+1]);
alphashrink = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"tmax") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
tmax = force->numeric(FLERR,arg[iarg+1]);
tmax = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"tmin") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
tmin = force->numeric(FLERR,arg[iarg+1]);
tmin = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"halfstepback") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
@ -715,7 +715,7 @@ void Min::modify_params(int narg, char **arg)
iarg += 2;
} else if (strcmp(arg[iarg],"vdfmax") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
max_vdotf_negatif = force->numeric(FLERR,arg[iarg+1]);
max_vdotf_negatif = utils::numeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"integrator") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");