ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@557 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2007-05-11 23:14:14 +00:00
parent 5a09959e99
commit b541c42518
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/variable.cpp
View File

@ -230,11 +230,14 @@ int Variable::next(int narg, char **arg)
if (narg == 0) error->all("Illegal next command"); if (narg == 0) error->all("Illegal next command");
// check that variables exist and are all the same style // check that variables exist and are all the same style
// exception: UNIVERSE and ULOOP variables can be mixed in same next command
for (int iarg = 0; iarg < narg; iarg++) { for (int iarg = 0; iarg < narg; iarg++) {
ivar = find(arg[iarg]); ivar = find(arg[iarg]);
if (ivar == -1) error->all("Invalid variable in next command"); if (ivar == -1) error->all("Invalid variable in next command");
if (style[ivar] != style[find(arg[0])]) if (style[ivar] == ULOOP && style[find(arg[0])] == UNIVERSE) continue;
else if (style[ivar] == UNIVERSE && style[find(arg[0])] == ULOOP) continue;
else if (style[ivar] != style[find(arg[0])])
error->all("All variables in next command must be same style"); error->all("All variables in next command must be same style");
} }