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

12
src/group.cpp
View File

@ -229,12 +229,12 @@ void Group::assign(int narg, char **arg)
else error->all(FLERR,"Illegal group command");
tagint bound1,bound2;
bound1 = force->tnumeric(FLERR,arg[3]);
bound1 = utils::tnumeric(FLERR,arg[3],false,lmp);
bound2 = -1;
if (condition == BETWEEN) {
if (narg != 5) error->all(FLERR,"Illegal group command");
bound2 = force->tnumeric(FLERR,arg[4]);
bound2 = utils::tnumeric(FLERR,arg[4],false,lmp);
} else if (narg != 4) error->all(FLERR,"Illegal group command");
int *attribute = NULL;
@ -311,13 +311,13 @@ void Group::assign(int narg, char **arg)
delta = 1;
if (strchr(arg[iarg],':')) {
ptr = strtok(arg[iarg],":");
start = force->tnumeric(FLERR,ptr);
start = utils::tnumeric(FLERR,ptr,false,lmp);
ptr = strtok(NULL,":");
stop = force->tnumeric(FLERR,ptr);
stop = utils::tnumeric(FLERR,ptr,false,lmp);
ptr = strtok(NULL,":");
if (ptr) delta = force->tnumeric(FLERR,ptr);
if (ptr) delta = utils::tnumeric(FLERR,ptr,false,lmp);
} else {
start = stop = force->tnumeric(FLERR,arg[iarg]);
start = stop = utils::tnumeric(FLERR,arg[iarg],false,lmp);
}
if (delta < 1)
error->all(FLERR,"Illegal range increment value");