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

30
src/compute_temp_profile.cpp
View File

@ -39,9 +39,9 @@ ComputeTempProfile::ComputeTempProfile(LAMMPS *lmp, int narg, char **arg) :
tempflag = 1;
tempbias = 1;
xflag = force->inumeric(FLERR,arg[3]);
yflag = force->inumeric(FLERR,arg[4]);
zflag = force->inumeric(FLERR,arg[5]);
xflag = utils::inumeric(FLERR,arg[3],false,lmp);
yflag = utils::inumeric(FLERR,arg[4],false,lmp);
zflag = utils::inumeric(FLERR,arg[5],false,lmp);
if (zflag && domain->dimension == 2)
error->all(FLERR,"Compute temp/profile cannot use vz for 2d systemx");
@ -57,44 +57,44 @@ ComputeTempProfile::ComputeTempProfile(LAMMPS *lmp, int narg, char **arg) :
int iarg = 6;
if (strcmp(arg[iarg],"x") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal compute temp/profile command");
nbinx = force->inumeric(FLERR,arg[iarg+1]);
nbinx = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"y") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal compute temp/profile command");
nbiny = force->inumeric(FLERR,arg[iarg+1]);
nbiny = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"z") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal compute temp/profile command");
if (domain->dimension == 2)
error->all(FLERR,"Compute temp/profile cannot bin z for 2d systems");
nbinz = force->inumeric(FLERR,arg[iarg+1]);
nbinz = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"xy") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal compute temp/profile command");
nbinx = force->inumeric(FLERR,arg[iarg+1]);
nbiny = force->inumeric(FLERR,arg[iarg+2]);
nbinx = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
nbiny = utils::inumeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg],"yz") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal compute temp/profile command");
if (domain->dimension == 2)
error->all(FLERR,"Compute temp/profile cannot bin z for 2d systems");
nbiny = force->inumeric(FLERR,arg[iarg+1]);
nbinz = force->inumeric(FLERR,arg[iarg+2]);
nbiny = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
nbinz = utils::inumeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg],"xz") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal compute temp/profile command");
if (domain->dimension == 2)
error->all(FLERR,"Compute temp/profile cannot bin z for 2d systems");
nbinx = force->inumeric(FLERR,arg[iarg+1]);
nbinz = force->inumeric(FLERR,arg[iarg+2]);
nbinx = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
nbinz = utils::inumeric(FLERR,arg[iarg+2],false,lmp);
iarg += 3;
} else if (strcmp(arg[iarg],"xyz") == 0) {
if (iarg+4 > narg) error->all(FLERR,"Illegal compute temp/profile command");
if (domain->dimension == 2)
error->all(FLERR,"Compute temp/profile cannot bin z for 2d systems");
nbinx = force->inumeric(FLERR,arg[iarg+1]);
nbiny = force->inumeric(FLERR,arg[iarg+2]);
nbinz = force->inumeric(FLERR,arg[iarg+3]);
nbinx = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
nbiny = utils::inumeric(FLERR,arg[iarg+2],false,lmp);
nbinz = utils::inumeric(FLERR,arg[iarg+3],false,lmp);
iarg += 4;
} else error->all(FLERR,"Illegal compute temp/profile command");