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

Comparing branches/development/src/nonbonded/InteractionManager.cpp (file contents):
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
Revision 1755 by gezelter, Thu Jun 14 01:58:35 2012 UTC

# Line 60 | Line 60 | namespace OpenMD {
60    }
61  
62    void InteractionManager::initialize() {
63 <    
63 >
64 >    if (initialized_) return;
65 >
66      ForceField* forceField_ = info_->getForceField();
67      
68      lj_->setForceField(forceField_);
# Line 379 | Line 381 | namespace OpenMD {
381  
382    RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
383      if (!initialized_) initialize();
384 <    
384 >
385      AtomType* atype = typeMap_[*atid];
386  
387      pair<AtomType*, AtomType*> key = make_pair(atype, atype);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines