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

This commit is contained in:
sjplimp
2016-08-09 14:10:55 +00:00
parent 550be1d512
commit 6c8d3ed4e8
11 changed files with 40 additions and 84 deletions

View File

@ -60,11 +60,10 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
// expand args if any have wildcard character "*"
int expand = 0;
char **earg,**arghold;
char **earg;
int nargnew = input->expand_args(narg-7,&arg[7],1,earg);
if (earg != &arg[7]) expand = 1;
arghold = arg;
arg = earg;
// parse values until one isn't recognized
@ -75,8 +74,9 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
value2index = new int[nargnew];
nvalues = 0;
int iarg = 7;
int iarg = 0;
while (iarg < narg) {
ids[nvalues] = NULL;
if (strcmp(arg[iarg],"vx") == 0) {
@ -376,9 +376,8 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
// wait to do this until after file comment lines are printed
if (expand) {
for (int i = 0; i < nvalues; i++) delete [] earg[i];
for (int i = 0; i < nargnew; i++) delete [] earg[i];
memory->sfree(earg);
arg = arghold;
}
// this fix produces a global array