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

fix suffix style handling bug for adding fixes and computes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-05-25 02:01:04 -04:00
parent 2225fce94e
commit 99a68e487f
5 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/modify.cpp
View File

@ -819,20 +819,26 @@ void Modify::add_fix(int narg, char **arg, int trysuffix)
if (trysuffix && lmp->suffix_enable) {
if (lmp->suffix) {
char estyle[256];
int n = strlen(arg[2])+strlen(lmp->suffix)+2;
char *estyle = new char[n];
sprintf(estyle,"%s/%s",arg[2],lmp->suffix);
if (fix_map->find(estyle) != fix_map->end()) {
FixCreator fix_creator = (*fix_map)[estyle];
fix[ifix] = fix_creator(lmp,narg,arg);
}
delete[] fix[ifix]->style;
fix[ifix]->style = estyle;
} else delete[] estyle;
}
if (fix[ifix] == NULL && lmp->suffix2) {
char estyle[256];
int n = strlen(arg[2])+strlen(lmp->suffix2)+2;
char *estyle = new char[n];
sprintf(estyle,"%s/%s",arg[2],lmp->suffix2);
if (fix_map->find(estyle) != fix_map->end()) {
FixCreator fix_creator = (*fix_map)[estyle];
fix[ifix] = fix_creator(lmp,narg,arg);
}
delete[] fix[ifix]->style;
fix[ifix]->style = estyle;
} else delete[] estyle;
}
}
@ -1018,20 +1024,26 @@ void Modify::add_compute(int narg, char **arg, int trysuffix)
if (trysuffix && lmp->suffix_enable) {
if (lmp->suffix) {
char estyle[256];
int n = strlen(arg[2])+strlen(lmp->suffix)+2;
char *estyle = new char[n];
sprintf(estyle,"%s/%s",arg[2],lmp->suffix);
if (compute_map->find(estyle) != compute_map->end()) {
ComputeCreator compute_creator = (*compute_map)[estyle];
compute[ncompute] = compute_creator(lmp,narg,arg);
}
delete[] compute[ncompute]->style;
compute[ncompute]->style = estyle;
} else delete[] estyle;
}
if (compute[ncompute] == NULL && lmp->suffix2) {
char estyle[256];
int n = strlen(arg[2])+strlen(lmp->suffix2)+2;
char *estyle = new char[n];
sprintf(estyle,"%s/%s",arg[2],lmp->suffix2);
if (compute_map->find(estyle) != compute_map->end()) {
ComputeCreator compute_creator = (*compute_map)[estyle];
compute[ncompute] = compute_creator(lmp,narg,arg);
}
delete[] compute[ncompute]->style;
compute[ncompute]->style = estyle;
} else delete[] estyle;
}
}