# | Line 1 | Line 1 | |
---|---|---|
1 | + | #include <iostream> |
2 | + | |
3 | + | using namespace std; |
4 | + | |
5 | #include "Atom.hpp" | |
6 | ||
7 | + | double* Atom::pos; // the position array |
8 | + | double* Atom::vel; // the velocity array |
9 | + | double* Atom::frc; // the forc array |
10 | + | double* Atom::trq; // the torque vector ( space fixed ) |
11 | + | double* Atom::Amat; // the rotation matrix |
12 | + | double* Atom::mu; // the array of dipole moments |
13 | + | double* Atom::ul; // the lab frame unit directional vector |
14 | + | int Atom::nElements; |
15 | + | |
16 | Atom::Atom(int theIndex) { | |
17 | c_n_hyd = 0; | |
18 | has_dipole = 0; | |
# | Line 25 | Line 38 | Atom::Atom(int theIndex) { | |
38 | Azz = Axx+8; | |
39 | } | |
40 | ||
41 | < | void Atom::createArrays (int nElements) { |
41 | > | void Atom::createArrays (int the_nElements) { |
42 | int i; | |
43 | ||
44 | + | nElements = the_nElements; |
45 | + | |
46 | pos = new double[nElements*3]; | |
47 | vel = new double[nElements*3]; | |
48 | frc = new double[nElements*3]; | |
# | Line 117 | Line 132 | void Atom::addAtoms(int nAdded, double* Apos, double* | |
132 | ||
133 | for(i = 0; i < 3*nAdded; i++) { | |
134 | j = i + 3*nElements; | |
135 | < | new_pos[j] = pos[i]; |
136 | < | new_vel[j] = vel[i]; |
137 | < | new_frc[j] = frc[i]; |
138 | < | new_trq[j] = trq[i]; |
139 | < | new_ul[j] = ul[i]; |
135 | > | new_pos[j] = Apos[i]; |
136 | > | new_vel[j] = Avel[i]; |
137 | > | new_frc[j] = Afrc[i]; |
138 | > | new_trq[j] = Atrq[i]; |
139 | > | new_ul[j] = Aul[i]; |
140 | } | |
141 | ||
142 | for (i = 0; i < 9*nElements; i++) { | |
# | Line 130 | Line 145 | void Atom::addAtoms(int nAdded, double* Apos, double* | |
145 | ||
146 | for(i = 0; i < 9*nAdded; i++) { | |
147 | j = i + 9*nElements; | |
148 | < | new_Amat[j] = Amat[i]; |
148 | > | new_Amat[j] = AAmat[i]; |
149 | } | |
150 | ||
151 | for (i = 0; i < nElements; i++) { | |
# | Line 139 | Line 154 | void Atom::addAtoms(int nAdded, double* Apos, double* | |
154 | ||
155 | for(i = 0; i < nAdded; i++) { | |
156 | j = i + nElements; | |
157 | < | new_mu[j] = mu[i]; |
157 | > | new_mu[j] = Amu[i]; |
158 | } | |
159 | ||
160 | delete[] pos; |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |