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

36
src/fix_deform.cpp
View File

@ -50,7 +50,7 @@ rfix(NULL), irregular(NULL), set(NULL)
restart_global = 1;
pre_exchange_migrate = 1;
nevery = force->inumeric(FLERR,arg[3]);
nevery = utils::inumeric(FLERR,arg[3],false,lmp);
if (nevery <= 0) error->all(FLERR,"Illegal fix deform command");
// set defaults
@ -77,34 +77,34 @@ rfix(NULL), irregular(NULL), set(NULL)
if (strcmp(arg[iarg+1],"final") == 0) {
if (iarg+4 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = FINAL;
set[index].flo = force->numeric(FLERR,arg[iarg+2]);
set[index].fhi = force->numeric(FLERR,arg[iarg+3]);
set[index].flo = utils::numeric(FLERR,arg[iarg+2],false,lmp);
set[index].fhi = utils::numeric(FLERR,arg[iarg+3],false,lmp);
iarg += 4;
} else if (strcmp(arg[iarg+1],"delta") == 0) {
if (iarg+4 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = DELTA;
set[index].dlo = force->numeric(FLERR,arg[iarg+2]);
set[index].dhi = force->numeric(FLERR,arg[iarg+3]);
set[index].dlo = utils::numeric(FLERR,arg[iarg+2],false,lmp);
set[index].dhi = utils::numeric(FLERR,arg[iarg+3],false,lmp);
iarg += 4;
} else if (strcmp(arg[iarg+1],"scale") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = SCALE;
set[index].scale = force->numeric(FLERR,arg[iarg+2]);
set[index].scale = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"vel") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = VEL;
set[index].vel = force->numeric(FLERR,arg[iarg+2]);
set[index].vel = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"erate") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = ERATE;
set[index].rate = force->numeric(FLERR,arg[iarg+2]);
set[index].rate = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"trate") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = TRATE;
set[index].rate = force->numeric(FLERR,arg[iarg+2]);
set[index].rate = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"volume") == 0) {
set[index].style = VOLUME;
@ -112,8 +112,8 @@ rfix(NULL), irregular(NULL), set(NULL)
} else if (strcmp(arg[iarg+1],"wiggle") == 0) {
if (iarg+4 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = WIGGLE;
set[index].amplitude = force->numeric(FLERR,arg[iarg+2]);
set[index].tperiod = force->numeric(FLERR,arg[iarg+3]);
set[index].amplitude = utils::numeric(FLERR,arg[iarg+2],false,lmp);
set[index].tperiod = utils::numeric(FLERR,arg[iarg+3],false,lmp);
if (set[index].tperiod <= 0.0)
error->all(FLERR,"Illegal fix deform command");
iarg += 4;
@ -149,33 +149,33 @@ rfix(NULL), irregular(NULL), set(NULL)
if (strcmp(arg[iarg+1],"final") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = FINAL;
set[index].ftilt = force->numeric(FLERR,arg[iarg+2]);
set[index].ftilt = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"delta") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = DELTA;
set[index].dtilt = force->numeric(FLERR,arg[iarg+2]);
set[index].dtilt = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"vel") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = VEL;
set[index].vel = force->numeric(FLERR,arg[iarg+2]);
set[index].vel = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"erate") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = ERATE;
set[index].rate = force->numeric(FLERR,arg[iarg+2]);
set[index].rate = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"trate") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = TRATE;
set[index].rate = force->numeric(FLERR,arg[iarg+2]);
set[index].rate = utils::numeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg+1],"wiggle") == 0) {
if (iarg+4 > narg) error->all(FLERR,"Illegal fix deform command");
set[index].style = WIGGLE;
set[index].amplitude = force->numeric(FLERR,arg[iarg+2]);
set[index].tperiod = force->numeric(FLERR,arg[iarg+3]);
set[index].amplitude = utils::numeric(FLERR,arg[iarg+2],false,lmp);
set[index].tperiod = utils::numeric(FLERR,arg[iarg+3],false,lmp);
if (set[index].tperiod <= 0.0)
error->all(FLERR,"Illegal fix deform command");
iarg += 4;