ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Atom.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Atom.cpp (file contents):
Revision 409 by gezelter, Wed Mar 26 21:04:38 2003 UTC vs.
Revision 413 by mmeineke, Wed Mar 26 21:54:49 2003 UTC

# Line 1 | Line 1
1   #include "Atom.hpp"
2  
3 + double* Atom::pos; // the position array
4 + double* Atom::vel; // the velocity array
5 + double* Atom::frc; // the forc array
6 + double* Atom::trq; // the torque vector  ( space fixed )
7 + double* Atom::Amat; // the rotation matrix
8 + double* Atom::mu;   // the array of dipole moments
9 + double* Atom::ul;   // the lab frame unit directional vector
10 + int Atom::nElements;
11 +
12   Atom::Atom(int theIndex) {
13    c_n_hyd = 0;
14    has_dipole = 0;
# Line 25 | Line 34 | void Atom::createArrays (int nElements) {
34    Azz = Axx+8;
35   }
36  
37 < void Atom::createArrays (int nElements) {
37 > void Atom::createArrays (int the_nElements) {
38    int i;
39    
40 +  nElements = the_nElements;
41 +
42    pos = new double[nElements*3];
43    vel = new double[nElements*3];
44    frc = new double[nElements*3];
# Line 117 | Line 128 | void Atom::addAtoms(int nAdded, double* Apos, double*
128  
129    for(i = 0; i < 3*nAdded; i++) {
130      j = i + 3*nElements;
131 <    new_pos[j] = pos[i];
132 <    new_vel[j] = vel[i];
133 <    new_frc[j] = frc[i];
134 <    new_trq[j] = trq[i];
135 <    new_ul[j] = ul[i];
131 >    new_pos[j] = Apos[i];
132 >    new_vel[j] = Avel[i];
133 >    new_frc[j] = Afrc[i];
134 >    new_trq[j] = Atrq[i];
135 >    new_ul[j] = Aul[i];
136    }
137  
138    for (i = 0; i < 9*nElements; i++) {
# Line 130 | Line 141 | void Atom::addAtoms(int nAdded, double* Apos, double*
141  
142    for(i = 0; i < 9*nAdded; i++) {
143      j = i + 9*nElements;
144 <    new_Amat[j] = Amat[i];
144 >    new_Amat[j] = AAmat[i];
145    }
146  
147    for (i = 0; i < nElements; i++) {
# Line 139 | Line 150 | void Atom::addAtoms(int nAdded, double* Apos, double*
150  
151    for(i = 0; i < nAdded; i++) {
152      j = i + nElements;
153 <    new_mu[j] = mu[i];
153 >    new_mu[j] = Amu[i];
154    }
155  
156    delete[] pos;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines