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

@ -43,20 +43,20 @@ RegCone::RegCone(LAMMPS *lmp, int narg, char **arg) :
axis = arg[2][0];
if (axis == 'x') {
c1 = yscale*force->numeric(FLERR,arg[3]);
c2 = zscale*force->numeric(FLERR,arg[4]);
radiuslo = yscale*force->numeric(FLERR,arg[5]);
radiushi = yscale*force->numeric(FLERR,arg[6]);
c1 = yscale*utils::numeric(FLERR,arg[3],false,lmp);
c2 = zscale*utils::numeric(FLERR,arg[4],false,lmp);
radiuslo = yscale*utils::numeric(FLERR,arg[5],false,lmp);
radiushi = yscale*utils::numeric(FLERR,arg[6],false,lmp);
} else if (axis == 'y') {
c1 = xscale*force->numeric(FLERR,arg[3]);
c2 = zscale*force->numeric(FLERR,arg[4]);
radiuslo = xscale*force->numeric(FLERR,arg[5]);
radiushi = xscale*force->numeric(FLERR,arg[6]);
c1 = xscale*utils::numeric(FLERR,arg[3],false,lmp);
c2 = zscale*utils::numeric(FLERR,arg[4],false,lmp);
radiuslo = xscale*utils::numeric(FLERR,arg[5],false,lmp);
radiushi = xscale*utils::numeric(FLERR,arg[6],false,lmp);
} else if (axis == 'z') {
c1 = xscale*force->numeric(FLERR,arg[3]);
c2 = yscale*force->numeric(FLERR,arg[4]);
radiuslo = xscale*force->numeric(FLERR,arg[5]);
radiushi = xscale*force->numeric(FLERR,arg[6]);
c1 = xscale*utils::numeric(FLERR,arg[3],false,lmp);
c2 = yscale*utils::numeric(FLERR,arg[4],false,lmp);
radiuslo = xscale*utils::numeric(FLERR,arg[5],false,lmp);
radiushi = xscale*utils::numeric(FLERR,arg[6],false,lmp);
}
if (strcmp(arg[7],"INF") == 0 || strcmp(arg[7],"EDGE") == 0) {
@ -78,9 +78,9 @@ RegCone::RegCone(LAMMPS *lmp, int narg, char **arg) :
else lo = domain->boxlo_bound[2];
}
} else {
if (axis == 'x') lo = xscale*force->numeric(FLERR,arg[7]);
if (axis == 'y') lo = yscale*force->numeric(FLERR,arg[7]);
if (axis == 'z') lo = zscale*force->numeric(FLERR,arg[7]);
if (axis == 'x') lo = xscale*utils::numeric(FLERR,arg[7],false,lmp);
if (axis == 'y') lo = yscale*utils::numeric(FLERR,arg[7],false,lmp);
if (axis == 'z') lo = zscale*utils::numeric(FLERR,arg[7],false,lmp);
}
if (strcmp(arg[8],"INF") == 0 || strcmp(arg[7],"EDGE") == 0) {
@ -102,9 +102,9 @@ RegCone::RegCone(LAMMPS *lmp, int narg, char **arg) :
else hi = domain->boxhi_bound[2];
}
} else {
if (axis == 'x') hi = xscale*force->numeric(FLERR,arg[8]);
if (axis == 'y') hi = yscale*force->numeric(FLERR,arg[8]);
if (axis == 'z') hi = zscale*force->numeric(FLERR,arg[8]);
if (axis == 'x') hi = xscale*utils::numeric(FLERR,arg[8],false,lmp);
if (axis == 'y') hi = yscale*utils::numeric(FLERR,arg[8],false,lmp);
if (axis == 'z') hi = zscale*utils::numeric(FLERR,arg[8],false,lmp);
}
// error check