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

This commit is contained in:
sjplimp
2014-01-14 16:17:20 +00:00
parent 35814a93eb
commit a1ef01fc1a
99 changed files with 358 additions and 348 deletions

View File

@ -81,7 +81,7 @@ int FixEvent::setmask()
void FixEvent::store_event()
{
double **x = atom->x;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
for (int i = 0; i < nlocal; i++)
@ -97,7 +97,7 @@ void FixEvent::store_event()
void FixEvent::restore_event()
{
double **x = atom->x;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
for (int i = 0; i < nlocal; i++) {
@ -108,8 +108,8 @@ void FixEvent::restore_event()
// since xevent is unwrapped coordinate, need to
// adjust image flags when remapping
image[i] = ((tagint) IMGMAX << IMG2BITS) |
((tagint) IMGMAX << IMGBITS) | IMGMASK;
image[i] = ((imageint) IMGMAX << IMG2BITS) |
((imageint) IMGMAX << IMGBITS) | IMGMASK;
domain->remap(x[i],image[i]);
}
@ -125,7 +125,7 @@ void FixEvent::store_state()
{
double **x = atom->x;
double **v = atom->v;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
for (int i = 0; i < nlocal; i++) {
@ -148,7 +148,7 @@ void FixEvent::restore_state()
{
double **x = atom->x;
double **v = atom->v;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
for (int i = 0; i < nlocal; i++) {