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 1595 by gezelter, Tue May 10 20:54:47 2011 UTC vs.
Revision 1596 by gezelter, Mon Jul 25 17:30:53 2011 UTC

# Line 499 | Line 499 | namespace OpenMD {
499          int bestScore = foundNBI[0].first;
500          std::vector<std::string> theKeys = foundNBI[0].second;
501          
502 <        NonBondedInteractionType* bestType = nonBondedInteractionTypeCont_.find(theKeys);
503 <        
502 >        NonBondedInteractionType* bestType = nonBondedInteractionTypeCont_.find(theKeys);        
503          return bestType;
504        } else {
505          //if no exact match found, try wild card match
506 <        return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);      
506 >        return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);
507        }
508      }
509    }

Diff Legend

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