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

Comparing branches/development/src/nonbonded/GB.cpp (file contents):
Revision 1570 by gezelter, Sat Apr 30 02:54:02 2011 UTC vs.
Revision 1571 by gezelter, Fri May 27 16:45:44 2011 UTC

# Line 267 | Line 267 | namespace OpenMD {
267  
268      if (!initialized_) initialize();
269      
270 <    GBInteractionData mixer = MixingMap[*(idat.atypes)];
270 >    GBInteractionData mixer = MixingMap[idat.atypes];
271  
272      RealType sigma0 = mixer.sigma0;
273      RealType dw     = mixer.dw;
# Line 284 | Line 284 | namespace OpenMD {
284  
285      RealType a, b, g;
286  
287 <    bool i_is_LJ = idat.atypes->first->isLennardJones();
288 <    bool j_is_LJ = idat.atypes->second->isLennardJones();
287 >    bool i_is_LJ = idat.atypes.first->isLennardJones();
288 >    bool j_is_LJ = idat.atypes.second->isLennardJones();
289      
290      if (i_is_LJ) {
291        a = 0.0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines