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

Switched the sign of spherical harmonics for m odd

Browse Source
This commit is contained in:
Aidan Thompson
2020-06-19 12:18:11 -06:00
parent fa6922a182
commit c7874fca86
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/compute_orientorder_atom.cpp
View File

@ -456,21 +456,26 @@ void ComputeOrientOrderAtom::calc_boop(double **rlist,
for (int il = 0; il < nqlist; il++) {
int l = qlist[il];
// calculate spherical harmonics
// Ylm, -l <= m <= l
// sign convention: sign(Yll(0,0)) = (-1)^l
qnm_r[il][l] += polar_prefactor(l, 0, costheta);
double expphim_r = expphi_r;
double expphim_i = expphi_i;
for(int m = 1; m <= +l; m++) {
double prefactor = polar_prefactor(l, m, costheta);
double c_r = prefactor * expphim_r;
double c_i = prefactor * expphim_i;
qnm_r[il][m+l] += c_r;
qnm_i[il][m+l] += c_i;
double ylm_r = prefactor * expphim_r;
double ylm_i = prefactor * expphim_i;
qnm_r[il][m+l] += ylm_r;
qnm_i[il][m+l] += ylm_i;
if(m & 1) {
qnm_r[il][-m+l] -= c_r;
qnm_i[il][-m+l] += c_i;
qnm_r[il][-m+l] -= ylm_r;
qnm_i[il][-m+l] += ylm_i;
} else {
qnm_r[il][-m+l] += c_r;
qnm_i[il][-m+l] -= c_i;
qnm_r[il][-m+l] += ylm_r;
qnm_i[il][-m+l] -= ylm_i;
}
double tmp_r = expphim_r*expphi_r - expphim_i*expphi_i;
double tmp_i = expphim_r*expphi_i + expphim_i*expphi_r;
@ -505,19 +510,6 @@ void ComputeOrientOrderAtom::calc_boop(double **rlist,
qn[jj++] = qnormfac * sqrt(qm_sum);
}
// TODO:
// 1. [done]Need to allocate extra memory in qnarray[] for this option
// 2. [done]Need to add keyword option
// 3. [done]Need to calculate Clebsch-Gordan/Wigner 3j coefficients
// (Can try getting them from boop.py first)
// 5. [done]Compare to bcc values in /Users/athomps/netapp/codes/MatMiner/matminer/matminer/featurizers/boop.py
// 6. [done]I get the right answer for W_l, but need to make sure that factor of 1/sqrt(l+1) is right for cglist
// 7. Add documentation
// 8. [done] run valgrind
// 9. [done] Add Wlhat
// 10. Update memory_usage()
// 11. Add exact FCC values for W_4, W_4_hat
// calculate W_l
if (wlflag) {
@ -554,7 +546,6 @@ void ComputeOrientOrderAtom::calc_boop(double **rlist,
idxcg_count++;
}
}
// Whats = [w/(q/np.sqrt(np.pi * 4 / (2 * l + 1)))**3 if abs(q) > 1.0e-6 else 0.0 for l,q,w in zip(range(1,max_l+1),Qs,Ws)]
if (qn[il] < QEPSILON)
qn[jj++] = 0.0;
else {
@ -565,7 +556,7 @@ void ComputeOrientOrderAtom::calc_boop(double **rlist,
}
}
// Calculate components of Q_l, for l=qlcomp
// Calculate components of Q_l/|Q_l|, for l=qlcomp
if (qlcompflag) {
int il = iqlcomp;
@ -619,6 +610,7 @@ double ComputeOrientOrderAtom::polar_prefactor(int l, int m, double costheta)
/* ----------------------------------------------------------------------
associated legendre polynomial
sign convention: P(l,l) = (2l-1)!!(-sqrt(1-x^2))^l
------------------------------------------------------------------------- */
double ComputeOrientOrderAtom::associated_legendre(int l, int m, double x)
@ -628,9 +620,9 @@ double ComputeOrientOrderAtom::associated_legendre(int l, int m, double x)
double p(1.0), pm1(0.0), pm2(0.0);
if (m != 0) {
const double sqx = sqrt(1.0-x*x);
const double msqx = -sqrt(1.0-x*x);
for (int i=1; i < m+1; ++i)
p *= static_cast<double>(2*i-1) * sqx;
p *= static_cast<double>(2*i-1) * msqx;
}
for (int i=m+1; i < l+1; ++i) {