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 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC vs.
Revision 1469 by gezelter, Mon Jul 19 14:07:59 2010 UTC

# Line 57 | Line 57
57   #include "primitives/Bend.hpp"
58   #include "primitives/Torsion.hpp"
59   #include "primitives/Inversion.hpp"
60 #include "nonbonded/LJ.hpp"
60  
61   namespace OpenMD {
62 <
62 >  
63 >  ForceManager::ForceManager(SimInfo * info) : info_(info),
64 >                                               NBforcesInitialized_(false) {
65 >    std::cerr << __PRETTY_FUNCTION__ << "\n";
66 >    lj_ = new LJ(info_->getForceField());
67 >  }
68 >
69    void ForceManager::calcForces() {
70      
71 +    std::cerr << __PRETTY_FUNCTION__ << "\n";
72      if (!info_->isFortranInitialized()) {
73        info_->update();
74      }
75      
76      if (!NBforcesInitialized_) {
77 <      LJ* lj = new LJ(info_->getForceField());
78 <      lj->initialize();
73 <    }
77 >      lj_->initialize();    
78 >    }
79  
80      preCalculation();
81      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines