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

8
src/PYTHON/python_impl.cpp
View File

@ -148,7 +148,7 @@ void PythonImpl::command(int narg, char **arg)
while (iarg < narg) {
if (strcmp(arg[iarg],"input") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Invalid python command");
ninput = force->inumeric(FLERR,arg[iarg+1]);
ninput = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
if (ninput < 0) error->all(FLERR,"Invalid python command");
iarg += 2;
istr = new char*[ninput];
@ -168,7 +168,7 @@ void PythonImpl::command(int narg, char **arg)
iarg += 2;
} else if (strcmp(arg[iarg],"length") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Invalid python command");
length_longstr = force->inumeric(FLERR,arg[iarg+1]);
length_longstr = utils::inumeric(FLERR,arg[iarg+1],false,lmp);
if (length_longstr <= 0) error->all(FLERR,"Invalid python command");
iarg += 2;
} else if (strcmp(arg[iarg],"file") == 0) {
@ -433,7 +433,7 @@ int PythonImpl::create_entry(char *name)
strcpy(pfuncs[ifunc].svalue[i],&istr[i][2]);
} else {
pfuncs[ifunc].ivarflag[i] = 0;
pfuncs[ifunc].ivalue[i] = force->inumeric(FLERR,istr[i]);
pfuncs[ifunc].ivalue[i] = utils::inumeric(FLERR,istr[i],false,lmp);
}
} else if (type == 'f') {
pfuncs[ifunc].itype[i] = DOUBLE;
@ -444,7 +444,7 @@ int PythonImpl::create_entry(char *name)
strcpy(pfuncs[ifunc].svalue[i],&istr[i][2]);
} else {
pfuncs[ifunc].ivarflag[i] = 0;
pfuncs[ifunc].dvalue[i] = force->numeric(FLERR,istr[i]);
pfuncs[ifunc].dvalue[i] = utils::numeric(FLERR,istr[i],false,lmp);
}
} else if (type == 's') {
pfuncs[ifunc].itype[i] = STRING;