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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/read_dump.cpp
View File

@ -543,7 +543,7 @@ void ReadDump::atoms()
// use irregular() in case atoms moved a long distance
double **x = atom->x;
tagint *image = atom->image;
imageint *image = atom->image;
nlocal = atom->nlocal;
for (int i = 0; i < nlocal; i++) domain->remap(x[i],image[i]);
@ -716,7 +716,7 @@ void ReadDump::process_atoms(int n)
double **x = atom->x;
double **v = atom->v;
double *q = atom->q;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
int map_tag_max = atom->map_tag_max;
@ -785,9 +785,9 @@ void ReadDump::process_atoms(int n)
if (!wrapped) xbox = ybox = zbox = 0;
image[m] = ((tagint) (xbox + IMGMAX) & IMGMASK) |
(((tagint) (ybox + IMGMAX) & IMGMASK) << IMGBITS) |
(((tagint) (zbox + IMGMAX) & IMGMASK) << IMG2BITS);
image[m] = ((imageint) (xbox + IMGMAX) & IMGMASK) |
(((imageint) (ybox + IMGMAX) & IMGMASK) << IMGBITS) |
(((imageint) (zbox + IMGMAX) & IMGMASK) << IMG2BITS);
}
}
@ -874,9 +874,9 @@ void ReadDump::process_atoms(int n)
// replace image flag in case changed by ix,iy,iz fields
image[m] = ((tagint) (xbox + IMGMAX) & IMGMASK) |
(((tagint) (ybox + IMGMAX) & IMGMASK) << IMGBITS) |
(((tagint) (zbox + IMGMAX) & IMGMASK) << IMG2BITS);
image[m] = ((imageint) (xbox + IMGMAX) & IMGMASK) |
(((imageint) (ybox + IMGMAX) & IMGMASK) << IMGBITS) |
(((imageint) (zbox + IMGMAX) & IMGMASK) << IMG2BITS);
}
}