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

correct utils::expand_args()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-08-18 18:04:44 -04:00
parent de61b3a547
commit 104fa4624e
1 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils.cpp
View File

@ -609,13 +609,11 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
expandflag = 1; expandflag = 1;
} }
} }
}
}
// only match custom array reference with a '*' wildcard // only match custom array reference with a '*' wildcard
// number range in the first pair of square brackets // number range in the first pair of square brackets
if ((word[0] == 'i') || (word[0] == 'd')) { } else if ((word[0] == 'i') || (word[0] == 'd')) {
int flag, cols; int flag, cols;
int icustom = lmp->atom->find_custom(id.c_str(), flag, cols); int icustom = lmp->atom->find_custom(id.c_str(), flag, cols);
@ -623,7 +621,7 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
// check for custom per-atom array // check for custom per-atom array
if (((word[0] == 'i') && (flag == 0)) || ((word[0] == 'i') && (flag == 1))) { if (((word[0] == 'i') && (flag == 0)) || ((word[0] == 'd') && (flag == 1))) {
nmax = cols; nmax = cols;
expandflag = 1; expandflag = 1;
} }
@ -650,7 +648,6 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
earg[newarg] = utils::strdup(fmt::format("{}_{}[{}]{}", word[0], id, index, tail)); earg[newarg] = utils::strdup(fmt::format("{}_{}[{}]{}", word[0], id, index, tail));
newarg++; newarg++;
} }
} else { } else {
// no expansion: duplicate original string // no expansion: duplicate original string
if (newarg == maxarg) { if (newarg == maxarg) {
@ -661,6 +658,7 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
newarg++; newarg++;
} }
} }
}
//printf("NEWARG %d\n",newarg); //printf("NEWARG %d\n",newarg);
//for (int i = 0; i < newarg; i++) //for (int i = 0; i < newarg; i++)