ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/heatflux/src/UseTheForce/ForceField.cpp
(Generate patch)

Comparing trunk/src/UseTheForce/ForceField.cpp (file contents):
Revision 1555 by gezelter, Tue May 10 20:54:47 2011 UTC vs.
Revision 1604 by jmichalk, Mon Aug 8 18:53:40 2011 UTC

# Line 440 | Line 440 | namespace OpenMD {
440    }
441    
442    NonBondedInteractionType* ForceField::getNonBondedInteractionType(const std::string &at1, const std::string &at2) {
443 +
444      std::vector<std::string> keys;
445      keys.push_back(at1);
446      keys.push_back(at2);    
# Line 499 | Line 500 | namespace OpenMD {
500          int bestScore = foundNBI[0].first;
501          std::vector<std::string> theKeys = foundNBI[0].second;
502          
503 <        NonBondedInteractionType* bestType = nonBondedInteractionTypeCont_.find(theKeys);
503 <        
503 >        NonBondedInteractionType* bestType = nonBondedInteractionTypeCont_.find(theKeys);        
504          return bestType;
505        } else {
506 <        //if no exact match found, try wild card match
507 <        return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);      
506 >         //if no exact match found, try wild card match
507 >        return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);
508        }
509      }
510    }

Diff Legend

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