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@15459 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-08-08 13:47:55 +00:00
parent 0029040f11
commit 056ff192c6
11 changed files with 38 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dump_custom.cpp
View File

@ -68,13 +68,15 @@ DumpCustom::DumpCustom(LAMMPS *lmp, int narg, char **arg) :
// nfield may be shrunk below if extra optional args exist
expand = 0;
nfield = input->expand_args(narg-5,&arg[5],1,earg);
nfield = nargnew = input->expand_args(narg-5,&arg[5],1,earg);
if (earg != &arg[5]) expand = 1;
// allocate field vectors
pack_choice = new FnPtrPack[nfield];
vtype = new int[nfield];
field2index = new int[nfield];
argindex = new int[nfield];
buffer_allow = 1;
buffer_flag = 1;
@ -87,9 +89,6 @@ DumpCustom::DumpCustom(LAMMPS *lmp, int narg, char **arg) :
// computes, fixes, variables which the dump accesses
memory->create(field2index,nfield,"dump:field2index");
memory->create(argindex,nfield,"dump:argindex");
ncompute = 0;
id_compute = NULL;
compute = NULL;
@ -181,14 +180,14 @@ DumpCustom::~DumpCustom()
// could not do in constructor, b/c some derived classes process earg
if (expand) {
for (int i = 0; i < nfield; i++) delete [] earg[i];
for (int i = 0; i < nargnew; i++) delete [] earg[i];
memory->sfree(earg);
}
delete [] pack_choice;
delete [] vtype;
memory->destroy(field2index);
memory->destroy(argindex);
delete [] field2index;
delete [] argindex;
delete [] idregion;
memory->destroy(thresh_array);