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

Comparing branches/development/src/nonbonded/Sticky.cpp (file contents):
Revision 1554 by gezelter, Sat Apr 30 02:54:02 2011 UTC vs.
Revision 1582 by gezelter, Tue Jun 14 20:41:44 2011 UTC

# Line 191 | Line 191 | namespace OpenMD {
191      if (!initialized_) initialize();
192      
193      map<pair<AtomType*, AtomType*>, StickyInteractionData>::iterator it;
194 <    it = MixingMap.find(*(idat.atypes));
194 >    it = MixingMap.find(idat.atypes);
195      if (it != MixingMap.end()) {
196  
197        StickyInteractionData mixer = (*it).second;
# Line 343 | Line 343 | namespace OpenMD {
343          }
344          
345          *(idat.vpair) += 0.5*(v0*s*w + v0p*sp*wp);
346 <        idat.pot[HYDROGENBONDING_FAMILY] += 0.5*(v0*s*w + v0p*sp*wp)* *(idat.sw) ;
346 >        (*(idat.pot))[HYDROGENBONDING_FAMILY] += 0.5*(v0*s*w + v0p*sp*wp)* *(idat.sw) ;
347          
348          // do the torques first since they are easy:
349          // remember that these are still in the body-fixed axes

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines