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 626 by mmeineke, Wed Jul 16 21:30:56 2003 UTC

# Line 1 | Line 1
1 + #include <iostream>
2 +
3 + using namespace std;
4 +
5 +
6   #include <cstdlib>
7  
8   #ifdef IS_MPI
# Line 21 | Line 26 | void ForceFields::calcRcut( void ){
26  
27    //calc rCut and rList
28  
29 <  entry_plug->rCut = 2.5 * bigSigma;
25 <  if(entry_plug->rCut > (entry_plug->box_x / 2.0))
26 <    entry_plug->rCut = entry_plug->box_x / 2.0;
27 <  if(entry_plug->rCut > (entry_plug->box_y / 2.0))
28 <    entry_plug->rCut = entry_plug->box_y / 2.0;
29 <  if(entry_plug->rCut > (entry_plug->box_z / 2.0))
30 <    entry_plug->rCut = entry_plug->box_z / 2.0;
31 <  
32 <  entry_plug->rList = entry_plug->rCut + 1.0;
33 <  
29 >  entry_plug->setRcut( 2.5 * bigSigma );  
30   }
31  
32   void ForceFields::doForces( int calcPot, int calcStress ){
# Line 43 | Line 39 | void ForceFields::doForces( int calcPot, int calcStres
39    double* u_l;;
40    DirectionalAtom* dAtom;
41  
46  double ut[3];
47
48  //u_l = new double[entry_plug->n_atoms];
49
42    short int passedCalcPot = (short int)calcPot;
43    short int passedCalcStress = (short int)calcStress;
44  
45 <  // forces are zeroed here, before any are acumulated.
45 >  // forces are zeroed here, before any are accumulated.
46    // NOTE: do not rezero the forces in Fortran.
47  
56
48    for(i=0; i<entry_plug->n_atoms; i++){
49 <    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 <    
49 >    entry_plug->atoms[i]->zeroForces();    
50    }
51  
52    for(i=0; i<entry_plug->n_mol; i++ ){
53      entry_plug->molecules[i].calcForces();
54    }
55  
56 +  
57 +  
58    frc = Atom::getFrcArray();
59    pos = Atom::getPosArray();
60    trq = Atom::getTrqArray();
61    A   = Atom::getAmatArray();
62    u_l = Atom::getUlArray();
63  
83  
64    isError = 0;
65    entry_plug->lrPot = 0.0;
66  
# Line 99 | Line 79 | void ForceFields::doForces( int calcPot, int calcStres
79                      &passedCalcStress,
80                      &isError );
81  
102  //  delete[] u_l;
103
82    if( isError ){
83      sprintf( painCave.errMsg,
84               "Error returned from the fortran force calculation.\n" );
# Line 113 | Line 91 | void ForceFields::doForces( int calcPot, int calcStres
91             "returned from the force calculation.\n" );
92    MPIcheckPoint();
93   #endif // is_mpi
94 +  
95  
96   }
97  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines