Updated compute hexorder/atom, added compute orientorder/atom

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14254 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
athomps
2015-11-16 23:14:35 +00:00
parent c28bd3c3ff
commit 27798d4f4e

View File

@ -249,7 +249,7 @@ void ComputeOrientOrderAtom::compute_peratom()
// if not nnn neighbors, order parameter = 0;
if (ncount < nnn) {
if ((ncount == 0) || (ncount < nnn)) {
for (int iw = 0; iw < nqlist; iw++)
qn[iw] = 0.0;
continue;
@ -259,15 +259,10 @@ void ComputeOrientOrderAtom::compute_peratom()
if (nnn > 0) {
select3(nnn,ncount,distsq,nearest,rlist);
calc_boop(rlist, nnn, qn, qlist, nqlist);
} else { // nnn == 0
if (ncount > 0)
calc_boop(rlist, ncount, qn, qlist, nqlist);
else { // ncount == 0
for (int iw = 0; iw < nqlist; iw++)
qn[iw] = 0.0;
}
ncount = nnn;
}
calc_boop(rlist, ncount, qn, qlist, nqlist);
}
}
}