diff --git a/src/atom.cpp b/src/atom.cpp index 51b48f3e1b..3a4d2c3b38 100644 --- a/src/atom.cpp +++ b/src/atom.cpp @@ -507,7 +507,6 @@ AtomVec *Atom::new_avec(const char *style, int trysuffix, int &sflag) AtomVecCreator avec_creator = (*avec_map)[style]; return avec_creator(lmp); } - //printf("test entries function: %s, %d, %d \n ",style, trysuffix, &sflag); error->all(FLERR,"Unknown atom style"); return NULL; } diff --git a/src/dump_custom.cpp b/src/dump_custom.cpp index 25925d6184..8e798ebd48 100644 --- a/src/dump_custom.cpp +++ b/src/dump_custom.cpp @@ -83,8 +83,8 @@ DumpCustom::DumpCustom(LAMMPS *lmp, int narg, char **arg) : pack_choice = new FnPtrPack[nfield]; vtype = new int[nfield]; - field2index = new int[nfield]; - argindex = new int[nfield]; + memory->create(field2index,nfield,"dump:field2index"); + memory->create(argindex,nfield,"dump:argindex"); buffer_allow = 1; buffer_flag = 1; @@ -201,8 +201,8 @@ DumpCustom::~DumpCustom() delete [] pack_choice; delete [] vtype; - delete [] field2index; - delete [] argindex; + memory->destroy(field2index); + memory->destroy(argindex); delete [] idregion; memory->destroy(thresh_array); @@ -245,8 +245,10 @@ DumpCustom::~DumpCustom() for (int i = 1; i <= ntypes; i++) delete [] typenames[i]; delete [] typenames; - for (int i = 0; i < size_one; i++) delete [] vformat[i]; - delete [] vformat; + if(vformat) { + for (int i = 0; i < size_one; i++) delete [] vformat[i]; + delete [] vformat; + } for (int i = 0; i < size_one; i++) delete [] format_column_user[i]; delete [] format_column_user; diff --git a/src/verlet.cpp b/src/verlet.cpp index a00b470e60..fe768f94c9 100644 --- a/src/verlet.cpp +++ b/src/verlet.cpp @@ -387,8 +387,6 @@ void Verlet::force_clear() if (nbytes) { memset(&atom->f[0][0],0,3*nbytes); - //test memset for fm - //memset(&atom->fm[0][0],0,3*nbytes); if (torqueflag) memset(&atom->torque[0][0],0,3*nbytes); if (extraflag) atom->avec->force_clear(0,nbytes); }