jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2016-08-01 20:55:29 +00:00
parent ce5f174281
commit 0995ab4b65
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/compute_reduce.cpp
View File

@ -72,16 +72,27 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) :
MPI_Comm_rank(world,&me); MPI_Comm_rank(world,&me);
// expand args if any have wildcard character "*"
int expand = 0;
char **earg,**arghold;
int nargnew = input->expand_args(narg-iarg,&arg[iarg],1,earg);
if (earg != &arg[iarg]) expand = 1;
arghold = arg;
arg = earg;
// parse remaining values until one isn't recognized // parse remaining values until one isn't recognized
which = new int[narg-4]; which = new int[nargnew];
argindex = new int[narg-4]; argindex = new int[nargnew];
flavor = new int[narg-4]; flavor = new int[nargnew];
ids = new char*[narg-4]; ids = new char*[nargnew];
value2index = new int[narg-4]; value2index = new int[nargnew];
nvalues = 0; nvalues = 0;
while (iarg < narg) { iarg = 0;
while (iarg < nargnew) {
ids[nvalues] = NULL; ids[nvalues] = NULL;
if (strcmp(arg[iarg],"x") == 0) { if (strcmp(arg[iarg],"x") == 0) {
@ -149,7 +160,7 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) :
replace = new int[nvalues]; replace = new int[nvalues];
for (int i = 0; i < nvalues; i++) replace[i] = -1; for (int i = 0; i < nvalues; i++) replace[i] = -1;
while (iarg < narg) { while (iarg < nargnew) {
if (strcmp(arg[iarg],"replace") == 0) { if (strcmp(arg[iarg],"replace") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal compute reduce command"); if (iarg+3 > narg) error->all(FLERR,"Illegal compute reduce command");
if (mode != MINN && mode != MAXX) if (mode != MINN && mode != MAXX)
@ -176,6 +187,14 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) :
replace = NULL; replace = NULL;
} }
// if wildcard expansion occurred, free earg memory from expand_args()
if (expand) {
for (int i = 0; i < nvalues; i++) delete [] earg[i];
memory->sfree(earg);
arg = arghold;
}
// setup and error check // setup and error check
for (int i = 0; i < nvalues; i++) { for (int i = 0; i < nvalues; i++) {