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

12
src/atom.cpp
View File

@ -569,7 +569,7 @@ int Atom::count_words(const char *line)
void Atom::data_atoms(int n, char *buf)
{
int m,xptr,iptr;
tagint imagedata;
imageint imagedata;
double xdata[3],lamda[3];
double *coord;
char *next;
@ -649,11 +649,11 @@ void Atom::data_atoms(int n, char *buf)
}
if (imageflag)
imagedata = ((tagint) (atoi(values[iptr]) + IMGMAX) & IMGMASK) |
(((tagint) (atoi(values[iptr+1]) + IMGMAX) & IMGMASK) << IMGBITS) |
(((tagint) (atoi(values[iptr+2]) + IMGMAX) & IMGMASK) << IMG2BITS);
else imagedata = ((tagint) IMGMAX << IMG2BITS) |
((tagint) IMGMAX << IMGBITS) | IMGMAX;
imagedata = ((imageint) (atoi(values[iptr]) + IMGMAX) & IMGMASK) |
(((imageint) (atoi(values[iptr+1]) + IMGMAX) & IMGMASK) << IMGBITS) |
(((imageint) (atoi(values[iptr+2]) + IMGMAX) & IMGMASK) << IMG2BITS);
else imagedata = ((imageint) IMGMAX << IMG2BITS) |
((imageint) IMGMAX << IMGBITS) | IMGMAX;
xdata[0] = atof(values[xptr]);
xdata[1] = atof(values[xptr+1]);