Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

2015-11-11 18:25:39 -05:00
parent a7c5dfeefe 3d144ab366
commit 8748114294
1 changed files with 2 additions and 1 deletions
--- a/src/compute_hexorder_atom.cpp
+++ b/src/compute_hexorder_atom.cpp
@ -232,7 +232,8 @@ inline void ComputeHexOrderAtom::calc_qn(double delx, double dely, double &u, do
  double rinv = 1.0/sqrt(delx*delx+dely*dely);
  double x = delx*rinv;
  double y = dely*rinv;
-  std::complex<double> z = x + y*1i;
+  //  std::complex<double> z = std::complex<double>(x, y);
+  std::complex<double> z(x, y);
  std::complex<double> zn = pow(z,nnn);
  u = real(zn);
  v = imag(zn);