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

Browse Source
This commit is contained in:
sjplimp
2013-07-30 15:41:40 +00:00
parent 424c14b992
commit 056264f86f
6 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/fix_property_atom.cpp
View File

@ -378,11 +378,14 @@ int FixPropertyAtom::unpack_exchange(int nlocal, double *buf)
int FixPropertyAtom::pack_restart(int i, double *buf)
{
buf[0] = nvalue+1;
for (int m = 1; m <= nvalue; m++) {
if (style[m] == MOLECULE) buf[m] = atom->molecule[i];
else if (style[m] == INTEGER) buf[m] = atom->ivector[index[m]][i];
else if (style[m] == DOUBLE) buf[m] = atom->dvector[index[m]][i];
int m = 1;
for (int j = 0; j < nvalue; j++) {
if (style[j] == MOLECULE) buf[m++] = atom->molecule[i];
else if (style[j] == INTEGER) buf[m++] = atom->ivector[index[m]][i];
else if (style[j] == DOUBLE) buf[m++] = atom->dvector[index[m]][i];
}
return nvalue+1;
}
@ -403,9 +406,9 @@ void FixPropertyAtom::unpack_restart(int nlocal, int nth)
for (int i = 0; i < nvalue; i++) {
if (style[i] == MOLECULE)
atom->molecule[nlocal] = static_cast<int> (extra[nlocal][m++]);
else if (style[m] == INTEGER)
else if (style[i] == INTEGER)
atom->ivector[index[m]][nlocal] = static_cast<int> (extra[nlocal][m++]);
else if (style[m] == DOUBLE)
else if (style[i] == DOUBLE)
atom->dvector[index[m]][nlocal] = extra[nlocal][m++];
}
}