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

Comparing trunk/OOPSE/libmdtools/ForceFields.cpp (file contents):
Revision 479 by chuckv, Tue Apr 8 15:20:44 2003 UTC vs.
Revision 484 by gezelter, Wed Apr 9 13:59:35 2003 UTC

# Line 43 | Line 43 | void ForceFields::doForces( int calcPot, int calcStres
43    double* u_l;;
44    DirectionalAtom* dAtom;
45  
46  double ut[3];
47
48  //u_l = new double[entry_plug->n_atoms];
49
46    short int passedCalcPot = (short int)calcPot;
47    short int passedCalcStress = (short int)calcStress;
48  
49 <  // forces are zeroed here, before any are acumulated.
49 >  // forces are zeroed here, before any are accumulated.
50    // NOTE: do not rezero the forces in Fortran.
51  
56
52    for(i=0; i<entry_plug->n_atoms; i++){
53 <    entry_plug->atoms[i]->zeroForces();
59 <
60 < //     if( entry_plug->atoms[i]->isDirectional() ){
61 < //       dAtom = (DirectionalAtom *)entry_plug->atoms[i];
62 < //       dAtom->getU(ut);
63 <    
64 <
65 < //       if(dAtom->getIndex()== 1){
66 < //      std::cerr << "atom 2's u_l = " << ut[0] << ", " << ut[1]
67 < //                << ", " << ut[2] << "\n";
68 < //       }
69 < //     }
70 <    
53 >    entry_plug->atoms[i]->zeroForces();    
54    }
55  
56    for(i=0; i<entry_plug->n_mol; i++ ){
# Line 79 | Line 62 | void ForceFields::doForces( int calcPot, int calcStres
62    trq = Atom::getTrqArray();
63    A   = Atom::getAmatArray();
64    u_l = Atom::getUlArray();
82
65    
66    isError = 0;
67    entry_plug->lrPot = 0.0;
# Line 99 | Line 81 | void ForceFields::doForces( int calcPot, int calcStres
81                      &passedCalcStress,
82                      &isError );
83  
102  //  delete[] u_l;
103
84    if( isError ){
85      sprintf( painCave.errMsg,
86               "Error returned from the fortran force calculation.\n" );

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines