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

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1868 by gezelter, Tue Apr 30 15:56:54 2013 UTC vs.
Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

# Line 67 | Line 67 | namespace OpenMD {
67   using namespace std;
68   namespace OpenMD {
69    
70 <  ForceManager::ForceManager(SimInfo * info) : info_(info), switcher_(NULL) {
70 >  ForceManager::ForceManager(SimInfo * info) : info_(info), switcher_(NULL),
71 >                                               initialized_(false) {
72      forceField_ = info_->getForceField();
73      interactionMan_ = new InteractionManager();
74      fDecomp_ = new ForceMatrixDecomposition(info_, interactionMan_);
# Line 693 | Line 694 | namespace OpenMD {
694      RealType rCutSq;
695      bool in_switching_region;
696      RealType sw, dswdr, swderiv;
697 <    vector<int> atomListColumn, atomListRow, atomListLocal;
697 >    vector<int> atomListColumn, atomListRow;
698      InteractionData idat;
699      SelfData sdat;
700      RealType mf;

Diff Legend

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