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

refactor utils::expand_args()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-03-15 20:50:26 -04:00
parent ece2433208
commit f835d5e69e
1 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/utils.cpp
View File

@ -443,16 +443,15 @@ template void utils::bounds<>(const char *, int, const std::string &,
int utils::expand_args(const char *file, int line, int narg, char **arg, int utils::expand_args(const char *file, int line, int narg, char **arg,
int mode, char **&earg, LAMMPS *lmp) int mode, char **&earg, LAMMPS *lmp)
{ {
int n,iarg,index,nlo,nhi,nmax,expandflag,icompute,ifix; int iarg;
char *ptr1,*ptr2,*str;
ptr1 = nullptr; char *ptr = nullptr;
for (iarg = 0; iarg < narg; iarg++) { for (iarg = 0; iarg < narg; iarg++) {
ptr1 = strchr(arg[iarg],'*'); ptr = strchr(arg[iarg],'*');
if (ptr1) break; if (ptr) break;
} }
if (!ptr1) { if (!ptr) {
earg = arg; earg = arg;
return narg; return narg;
} }
@ -462,99 +461,96 @@ int utils::expand_args(const char *file, int line, int narg, char **arg,
int maxarg = narg-iarg; int maxarg = narg-iarg;
earg = (char **) lmp->memory->smalloc(maxarg*sizeof(char *),"input:earg"); earg = (char **) lmp->memory->smalloc(maxarg*sizeof(char *),"input:earg");
int newarg = 0; int newarg = 0, expandflag, nlo, nhi, nmax;
std::string id, wc, tail;
for (iarg = 0; iarg < narg; iarg++) { for (iarg = 0; iarg < narg; iarg++) {
expandflag = 0; std::string word(arg[iarg]);
if (strncmp(arg[iarg],"c_",2) == 0 || // only match compute/fix reference with a '*' wildcard
strncmp(arg[iarg],"f_",2) == 0) { // number range in the first pair of square brackets
ptr1 = strchr(&arg[iarg][2],'['); if (strmatch(word,"^[cf]_\\w+\\[\\d*\\*\\d*\\]")) {
if (ptr1) {
ptr2 = strchr(ptr1,']'); // split off the compute/fix ID, the wildcard and trailing text
if (ptr2) { size_t first = word.find("[");
*ptr2 = '\0'; size_t second = word.find("]",first+1);
if (strchr(ptr1,'*')) { id = word.substr(2,first-2);
if (arg[iarg][0] == 'c') { wc = word.substr(first+1,second-first-1);
*ptr1 = '\0'; tail = word.substr(second+1);
icompute = lmp->modify->find_compute(&arg[iarg][2]);
*ptr1 = '['; if (word[0] == 'c') {
int icompute = lmp->modify->find_compute(id);
// check for global vector/array, peratom array, local array // check for global vector/array, peratom array, local array
if (icompute >= 0) { if (icompute >= 0) {
if (mode == 0 && lmp->modify->compute[icompute]->vector_flag) { Compute *compute = lmp->modify->compute[icompute];
nmax = lmp->modify->compute[icompute]->size_vector; if (mode == 0 && compute->vector_flag) {
nmax = compute->size_vector;
expandflag = 1; expandflag = 1;
} else if (mode == 1 && lmp->modify->compute[icompute]->array_flag) { } else if (mode == 1 && compute->array_flag) {
nmax = lmp->modify->compute[icompute]->size_array_cols; nmax = compute->size_array_cols;
expandflag = 1; expandflag = 1;
} else if (lmp->modify->compute[icompute]->peratom_flag && } else if (compute->peratom_flag && compute->size_peratom_cols) {
lmp->modify->compute[icompute]->size_peratom_cols) { nmax = compute->size_peratom_cols;
nmax = lmp->modify->compute[icompute]->size_peratom_cols;
expandflag = 1; expandflag = 1;
} else if (lmp->modify->compute[icompute]->local_flag && } else if (compute->local_flag && compute->size_local_cols) {
lmp->modify->compute[icompute]->size_local_cols) { nmax = compute->size_local_cols;
nmax = lmp->modify->compute[icompute]->size_local_cols;
expandflag = 1; expandflag = 1;
} }
} }
} else if (arg[iarg][0] == 'f') { } else if (word[0] == 'f') {
*ptr1 = '\0'; int ifix = lmp->modify->find_fix(id);
ifix = lmp->modify->find_fix(&arg[iarg][2]);
*ptr1 = '[';
// check for global vector/array, peratom array, local array // check for global vector/array, peratom array, local array
if (ifix >= 0) { if (ifix >= 0) {
if (mode == 0 && lmp->modify->fix[ifix]->vector_flag) { Fix *fix = lmp->modify->fix[ifix];
nmax = lmp->modify->fix[ifix]->size_vector;
if (mode == 0 && fix->vector_flag) {
nmax = fix->size_vector;
expandflag = 1; expandflag = 1;
} else if (mode == 1 && lmp->modify->fix[ifix]->array_flag) { } else if (mode == 1 && fix->array_flag) {
nmax = lmp->modify->fix[ifix]->size_array_cols; nmax = fix->size_array_cols;
expandflag = 1; expandflag = 1;
} else if (lmp->modify->fix[ifix]->peratom_flag && } else if (fix->peratom_flag && fix->size_peratom_cols) {
lmp->modify->fix[ifix]->size_peratom_cols) { nmax = fix->size_peratom_cols;
nmax = lmp->modify->fix[ifix]->size_peratom_cols;
expandflag = 1; expandflag = 1;
} else if (lmp->modify->fix[ifix]->local_flag && } else if (fix->local_flag && fix->size_local_cols) {
lmp->modify->fix[ifix]->size_local_cols) { nmax = fix->size_local_cols;
nmax = lmp->modify->fix[ifix]->size_local_cols;
expandflag = 1; expandflag = 1;
} }
} }
} }
} }
*ptr2 = ']';
}
}
}
if (expandflag) { if (expandflag) {
*ptr2 = '\0';
bounds(file,line,ptr1+1,1,nmax,nlo,nhi,lmp->error); // expand wild card string to nlo/nhi numbers
*ptr2 = ']'; utils::bounds(file,line,wc,1,nmax,nlo,nhi,lmp->error);
if (newarg+nhi-nlo+1 > maxarg) { if (newarg+nhi-nlo+1 > maxarg) {
maxarg += nhi-nlo+1; maxarg += nhi-nlo+1;
earg = (char **) earg = (char **)
lmp->memory->srealloc(earg,maxarg*sizeof(char *),"input:earg"); lmp->memory->srealloc(earg,maxarg*sizeof(char *),"input:earg");
} }
for (index = nlo; index <= nhi; index++) {
n = strlen(arg[iarg]) + 16; // 16 = space for large inserted integer for (int index = nlo; index <= nhi; index++) {
str = earg[newarg] = new char[n]; // assemble and duplicate expanded string
strncpy(str,arg[iarg],ptr1+1-arg[iarg]); earg[newarg] = utils::strdup(fmt::format("{}_{}[{}]{}",word[0],
sprintf(&str[ptr1+1-arg[iarg]],"%d",index); id,index,tail));
strcat(str,ptr2);
newarg++; newarg++;
} }
} else { } else {
// no expansion: duplicate original string
if (newarg == maxarg) { if (newarg == maxarg) {
maxarg++; maxarg++;
earg = (char **) earg = (char **)
lmp->memory->srealloc(earg,maxarg*sizeof(char *),"input:earg"); lmp->memory->srealloc(earg,maxarg*sizeof(char *),"input:earg");
} }
earg[newarg] = utils::strdup(arg[iarg]); earg[newarg] = utils::strdup(word);
newarg++; newarg++;
} }
} }