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

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

Browse Source
This commit is contained in:
sjplimp
2016-08-08 19:41:43 +00:00
parent 563e069971
commit 550be1d512
11 changed files with 84 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fix_ave_chunk.cpp
View File

@ -60,10 +60,11 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
// expand args if any have wildcard character "*"
int expand = 0;
char **earg;
char **earg,**arghold;
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
@ -74,9 +75,8 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
value2index = new int[nargnew];
nvalues = 0;
int iarg = 0;
int iarg = 7;
while (iarg < narg) {
ids[nvalues] = NULL;
if (strcmp(arg[iarg],"vx") == 0) {
@ -376,8 +376,9 @@ 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 < nargnew; i++) delete [] earg[i];
for (int i = 0; i < nvalues; i++) delete [] earg[i];
memory->sfree(earg);
arg = arghold;
}
// this fix produces a global array