ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/nonbonded/LJ.cpp
(Generate patch)

Comparing trunk/src/nonbonded/LJ.cpp (file contents):
Revision 1895 by gezelter, Mon Jul 1 21:09:37 2013 UTC vs.
Revision 2069 by gezelter, Thu Mar 5 16:30:23 2015 UTC

# Line 136 | Line 136 | namespace OpenMD {
136  
137    void LJ::addType(AtomType* atomType){
138      LennardJonesAdapter lja1 = LennardJonesAdapter(atomType);
139
140    RealType sigma1 = lja1.getSigma();
141    RealType epsilon1 = lja1.getEpsilon();
139      
140      // add it to the map:
141      int atid = atomType->getIdent();
# Line 263 | Line 260 | namespace OpenMD {
260      
261      RealType dudr = *(idat.sw) * *(idat.vdwMult) * epsilon * (myDeriv -
262                                                                myDerivC)*sigmai;      
266    
263      (*(idat.pot))[VANDERWAALS_FAMILY] += *(idat.sw) * pot_temp;
264      *(idat.f1) += *(idat.d) * dudr / *(idat.rij);
265      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines