ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/UseTheForce/Shapes_FF.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/UseTheForce/Shapes_FF.cpp (file contents):
Revision 1613 by gezelter, Wed Oct 20 04:54:23 2004 UTC vs.
Revision 1636 by chrisfen, Fri Oct 22 22:54:01 2004 UTC

# Line 128 | Line 128 | void Shapes_FF::initForceField(int ljMixRule){
128   }
129  
130  
131 < void Shapes_FF::initForceField(int ljMixRule){
132 <  initFortran(ljMixRule, 0);
131 > void Shapes_FF::initForceField(){
132 >  initFortran(0);
133   }
134  
135  
# Line 309 | Line 309 | void Shapes_FF::readParams( void ){
309      currentAtomType = currentAtomType->next;
310    }
311        
312 <  entry_plug->useLJ = 0;
312 >  entry_plug->useLennardJones = 0;
313    entry_plug->useEAM = 1;
314    // Walk down again and send out EAM type
315    currentAtomType = headAtomType->next;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines