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

10
src/fix_wall.cpp
View File

@ -87,7 +87,7 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
strcpy(xstr[nwall],&arg[iarg+1][2]);
} else {
xstyle[nwall] = CONSTANT;
coord0[nwall] = force->numeric(FLERR,arg[iarg+1]);
coord0[nwall] = utils::numeric(FLERR,arg[iarg+1],false,lmp);
}
if (strstr(arg[iarg+2],"v_") == arg[iarg+2]) {
@ -96,7 +96,7 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
strcpy(estr[nwall],&arg[iarg+2][2]);
estyle[nwall] = VARIABLE;
} else {
epsilon[nwall] = force->numeric(FLERR,arg[iarg+2]);
epsilon[nwall] = utils::numeric(FLERR,arg[iarg+2],false,lmp);
estyle[nwall] = CONSTANT;
}
@ -107,7 +107,7 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
strcpy(astr[nwall],&arg[iarg+3][2]);
astyle[nwall] = VARIABLE;
} else {
alpha[nwall] = force->numeric(FLERR,arg[iarg+3]);
alpha[nwall] = utils::numeric(FLERR,arg[iarg+3],false,lmp);
astyle[nwall] = CONSTANT;
}
++iarg;
@ -119,11 +119,11 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
strcpy(sstr[nwall],&arg[iarg+3][2]);
sstyle[nwall] = VARIABLE;
} else {
sigma[nwall] = force->numeric(FLERR,arg[iarg+3]);
sigma[nwall] = utils::numeric(FLERR,arg[iarg+3],false,lmp);
sstyle[nwall] = CONSTANT;
}
cutoff[nwall] = force->numeric(FLERR,arg[iarg+4]);
cutoff[nwall] = utils::numeric(FLERR,arg[iarg+4],false,lmp);
nwall++;
iarg += 5;