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

Comparing branches/development/src/brains/ForceManager.hpp (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 52 | Line 52
52  
53   #include "brains/SimInfo.hpp"
54   #include "primitives/Molecule.hpp"
55 + #include "nonbonded/LJ.hpp"
56 +
57   namespace OpenMD {
58    /**
59     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
# Line 67 | Line 69 | namespace OpenMD {
69    class ForceManager {
70  
71    public:
72 <    ForceManager(SimInfo * info) : info_(info), NBforcesInitialized_(false) {}
73 <        
72 >    
73 >    ForceManager(SimInfo * info);                          
74      virtual ~ForceManager() {}
75  
76      // public virtual functions should be avoided
77      /**@todo needs refactoring */
78      virtual void calcForces();
79 +    virtual void init();
80  
78    virtual void init() {}
81    protected:
82  
83 <    virtual void preCalculation();
82 <        
83 >    virtual void preCalculation();        
84      virtual void calcShortRangeInteraction();
84
85      virtual void calcLongRangeInteraction();
86
86      virtual void postCalculation();
87  
88      SimInfo * info_;        
89 <
89 >    LJ* lj_;
90      std::map<Bend*, BendDataSet> bendDataSets;
91      std::map<Torsion*, TorsionDataSet> torsionDataSets;
92      std::map<Inversion*, InversionDataSet> inversionDataSets;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines