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

This commit is contained in:
sjplimp
2011-03-26 00:50:29 +00:00
parent fbb475b9cd
commit 1f2a7add78
131 changed files with 1278 additions and 1496 deletions

View File

@ -231,7 +231,7 @@ ComputePropertyAtom::ComputePropertyAtom(LAMMPS *lmp, int narg, char **arg) :
ComputePropertyAtom::~ComputePropertyAtom()
{
delete [] pack_choice;
memory->sfree(vector);
memory->destroy(vector);
memory->destroy(array);
}
@ -246,9 +246,8 @@ void ComputePropertyAtom::compute_peratom()
if (atom->nlocal > nmax) {
nmax = atom->nmax;
if (nvalues == 1) {
memory->sfree(vector);
vector = (double *) memory->smalloc(nmax*sizeof(double),
"property/atom:vector");
memory->destroy(vector);
memory->create(vector,nmax,"property/atom:vector");
vector_atom = vector;
} else {
memory->destroy(array);