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

Browse Source
This commit is contained in:
sjplimp
2011-03-25 21:13:51 +00:00
parent e3cf018311
commit fbb475b9cd
149 changed files with 1402 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/fix_move.cpp
View File

@ -273,9 +273,9 @@ FixMove::~FixMove()
// delete locally stored arrays
memory->destroy_2d_double_array(xoriginal);
memory->destroy_2d_double_array(displace);
memory->destroy_2d_double_array(velocity);
memory->destroy(xoriginal);
memory->destroy(displace);
memory->destroy(velocity);
delete [] xvarstr;
delete [] yvarstr;
@ -561,12 +561,12 @@ void FixMove::initial_integrate(int vflag)
if ((displaceflag || velocityflag) && nlocal > maxatom) {
maxatom = atom->nmax;
if (displaceflag) {
memory->destroy_2d_double_array(displace);
displace = memory->create_2d_double_array(maxatom,3,"move:displace");
memory->destroy(displace);
memory->create(displace,maxatom,3,"move:displace");
}
if (velocityflag) {
memory->destroy_2d_double_array(velocity);
velocity = memory->create_2d_double_array(maxatom,3,"move:velocity");
memory->destroy(velocity);
memory->create(velocity,maxatom,3,"move:velocity");
}
}
@ -843,8 +843,7 @@ void FixMove::restart(char *buf)
void FixMove::grow_arrays(int nmax)
{
xoriginal =
memory->grow_2d_double_array(xoriginal,nmax,3,"move:xoriginal");
memory->grow(xoriginal,nmax,3,"move:xoriginal");
array_atom = xoriginal;
}