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 1656 by jmichalk, Tue Oct 11 19:46:51 2011 UTC vs.
Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "nonbonded/InteractionManager.hpp"
# Line 59 | 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 84 | Line 87 | namespace OpenMD {
87           atype1 = atomTypes->nextType(i1)) {
88        
89        // add it to the map:
87 –      AtomTypeProperties atp = atype1->getATP();    
90        
91        pair<map<int,AtomType*>::iterator,bool> ret;    
92 <      ret = typeMap_.insert( pair<int, AtomType*>(atp.ident, atype1) );
92 >      ret = typeMap_.insert( pair<int, AtomType*>(atype1->getIdent(), atype1) );
93        if (ret.second == false) {
94          sprintf( painCave.errMsg,
95                   "InteractionManager already had a previous entry with ident %d\n",
96 <                 atp.ident);
96 >                 atype1->getIdent());
97          painCave.severity = OPENMD_INFO;
98          painCave.isFatal = 0;
99          simError();                
# Line 302 | Line 304 | namespace OpenMD {
304      eam_->setCutoffRadius(rcut);
305    }
306  
305 –  void InteractionManager::setSwitchingRadius(RealType rswitch) {
306 –    electrostatic_->setSwitchingRadius(rswitch);
307 –  }
308 –  
307    void InteractionManager::doPrePair(InteractionData idat){
308      
309      if (!initialized_) initialize();
# Line 379 | Line 377 | namespace OpenMD {
377  
378    RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
379      if (!initialized_) initialize();
380 <    
380 >
381      AtomType* atype = typeMap_[*atid];
382  
383      pair<AtomType*, AtomType*> key = make_pair(atype, atype);

Diff Legend

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