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 1583 by gezelter, Thu Jun 16 22:00:08 2011 UTC vs.
Revision 1586 by gezelter, Tue Jun 21 06:34:35 2011 UTC

# Line 67 | Line 67 | namespace OpenMD {
67      eam_->setForceField(forceField_);
68      sc_->setForceField(forceField_);
69      morse_->setForceField(forceField_);
70 +    electrostatic_->setSimInfo(info_);
71      electrostatic_->setForceField(forceField_);
72      maw_->setForceField(forceField_);
73  
# Line 267 | Line 268 | namespace OpenMD {
268      }
269  
270      initialized_ = true;
271 +  }
272 +
273 +  void InteractionManager::setCutoffRadius(RealType rcut) {
274 +    electrostatic_->setCutoffRadius(rcut);
275 +    eam_->setCutoffRadius(rcut);
276 +  }
277 +
278 +  void InteractionManager::setSwitchingRadius(RealType rswitch) {
279 +    electrostatic_->setSwitchingRadius(rswitch);
280    }
281    
282    void InteractionManager::doPrePair(InteractionData idat){
# Line 317 | Line 327 | namespace OpenMD {
327    void InteractionManager::doSkipCorrection(InteractionData idat){
328  
329      if (!initialized_) initialize();  
330 <    
330 >
331      set<NonBondedInteraction*>::iterator it;
332  
333      for (it = interactions_[ idat.atypes ].begin();

Diff Legend

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