ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/restraints/RestraintForceManager.cpp
(Generate patch)

Comparing trunk/src/restraints/RestraintForceManager.cpp (file contents):
Revision 2020 by gezelter, Mon Sep 22 19:18:35 2014 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 329 | Line 329 | namespace OpenMD {
329   #endif
330  
331      currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
332 –    RealType pot = currSnapshot_->getLongRangePotential();
333 –    pot += restPot;
334 –    currSnapshot_->setLongRangePotential(pot);
332      currSnapshot_->setRestraintPotential(restPot);
333  
334      //write out forces and current positions of restrained molecules    
# Line 345 | Line 342 | namespace OpenMD {
342      std::vector<Molecule*>::const_iterator rm;
343      GenericData* data;
344      Molecule::IntegrableObjectIterator ioi;
345 <    MolecularRestraint* mRest;
345 >    MolecularRestraint* mRest = NULL;
346      StuntDouble* sd;
347  
348      std::vector<StuntDouble*>::const_iterator ro;
349 <    ObjectRestraint* oRest;
349 >    ObjectRestraint* oRest = NULL;
350  
351      std::map<int, Restraint::RealPair> restInfo;
352  

Diff Legend

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