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

14
src/fix_gravity.cpp
View File

@ -58,7 +58,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(mstr,&arg[3][2]);
mstyle = EQUAL;
} else {
magnitude = force->numeric(FLERR,arg[3]);
magnitude = utils::numeric(FLERR,arg[3],false,lmp);
mstyle = CONSTANT;
}
@ -73,7 +73,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(vstr,&arg[5][2]);
vstyle = EQUAL;
} else {
vert = force->numeric(FLERR,arg[5]);
vert = utils::numeric(FLERR,arg[5],false,lmp);
vstyle = CONSTANT;
}
iarg = 6;
@ -87,7 +87,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(pstr,&arg[5][2]);
pstyle = EQUAL;
} else {
phi = force->numeric(FLERR,arg[5]);
phi = utils::numeric(FLERR,arg[5],false,lmp);
pstyle = CONSTANT;
}
if (strstr(arg[6],"v_") == arg[6]) {
@ -96,7 +96,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(tstr,&arg[6][2]);
tstyle = EQUAL;
} else {
theta = force->numeric(FLERR,arg[6]);
theta = utils::numeric(FLERR,arg[6],false,lmp);
tstyle = CONSTANT;
}
iarg = 7;
@ -110,7 +110,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(xstr,&arg[5][2]);
xstyle = EQUAL;
} else {
xdir = force->numeric(FLERR,arg[5]);
xdir = utils::numeric(FLERR,arg[5],false,lmp);
xstyle = CONSTANT;
}
if (strstr(arg[6],"v_") == arg[6]) {
@ -119,7 +119,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(ystr,&arg[6][2]);
ystyle = EQUAL;
} else {
ydir = force->numeric(FLERR,arg[6]);
ydir = utils::numeric(FLERR,arg[6],false,lmp);
ystyle = CONSTANT;
}
if (strstr(arg[7],"v_") == arg[7]) {
@ -128,7 +128,7 @@ FixGravity::FixGravity(LAMMPS *lmp, int narg, char **arg) :
strcpy(zstr,&arg[7][2]);
zstyle = EQUAL;
} else {
zdir = force->numeric(FLERR,arg[7]);
zdir = utils::numeric(FLERR,arg[7],false,lmp);
zstyle = CONSTANT;
}
iarg = 8;