ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Steve Plimpton
2020-07-07 11:46:05 -06:00
parent 955bff7c4e 7e140399db
commit 88fc9360c0
4 changed files with 360 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/atom_vec_ellipsoid.cpp
View File

@ -500,9 +500,9 @@ int AtomVecEllipsoid::pack_data_bonus(double *buf, int /*flag*/)
if (buf) {
buf[m++] = ubuf(tag[i]).d;
j = ellipsoid[i];
buf[m++] = bonus[j].shape[0];
buf[m++] = bonus[j].shape[1];
buf[m++] = bonus[j].shape[2];
buf[m++] = 2.0*bonus[j].shape[0];
buf[m++] = 2.0*bonus[j].shape[1];
buf[m++] = 2.0*bonus[j].shape[2];
buf[m++] = bonus[j].quat[0];
buf[m++] = bonus[j].quat[1];
buf[m++] = bonus[j].quat[2];