ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/primitives/GhostBend.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/primitives/GhostBend.cpp (file contents):
Revision 1692 by tim, Mon Nov 1 20:15:58 2004 UTC vs.
Revision 1701 by tim, Wed Nov 3 16:08:43 2004 UTC

# Line 20 | Line 20 | GhostBend::GhostBend( Atom &a, Atom &b ){
20      sprintf( painCave.errMsg,
21               " Ghost Bend error: Atom # %d of type \"%s\" is not "
22               "directional.\n",
23 <             b.getIndex(),
24 <             b.getType() );
23 >             b.getLocalIndex(),
24 >             b.getType().c_str() );
25      painCave.isFatal = 1;
26      simError();
27    }    
# Line 48 | Line 48 | void GhostBend::calc_forces(){
48    double daxi, dayi, dazi, daxk, dayk, dazk, daxj, dayj, dazj;
49    Vector3d u;
50    
51 <  double aR[3], bR[3];
52 <  double aF[3], bF[3], bTrq[3];
51 >  Vector3d aR, bR;
52 >  Vector3d aF, bF, bTrq;
53  
54    aR = c_p_a->getPos();
55    bR = atomB->getPos();
# Line 59 | Line 59 | void GhostBend::calc_forces(){
59    dy = aR[1] - bR[1];
60    dz = aR[2] - bR[2];
61  
62 <  u = atomB->getU();
62 >  u = atomB->getUnitVector();
63  
64    gx = u[0];
65    gy = u[1];

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines