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 1570 by gezelter, Thu May 26 21:56:04 2011 UTC vs.
Revision 1780 by jmarr, Mon Aug 20 18:28:22 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 52 | Line 53
53  
54   #include "brains/SimInfo.hpp"
55   #include "primitives/Molecule.hpp"
56 + #include "nonbonded/Cutoffs.hpp"
57 + #include "nonbonded/SwitchingFunction.hpp"
58   #include "nonbonded/InteractionManager.hpp"
59 + #include "perturbations/Perturbation.hpp"
60   #include "parallel/ForceDecomposition.hpp"
61  
62   #define PREPAIR_LOOP 0
# Line 62 | Line 66 | namespace OpenMD {
66   namespace OpenMD {
67    /**
68     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
69 <   * ForceManager is responsible for calculating the short range
70 <   * interactions and long range interactions.
69 >   * ForceManager is responsible for calculating both the short range
70 >   * (bonded) interactions and long range (non-bonded) interactions.
71     *
72 <   * @note the reason we delay some of the setup is that some
73 <   * applications (Dump2XYZ etc.) may not need force calculation, so
74 <   * why bother?
72 >   * @note the reason we delay some of the setup is that
73 >   * initialization must wait until after the force field has been
74 >   * parsed so that the atom types are known.
75     */
76    class ForceManager {
77  
78    public:
75    
79      ForceManager(SimInfo * info);                          
80      virtual ~ForceManager() {}
81      virtual void calcForces();
82 <    virtual void init() {};
82 >    void initialize();
83  
84 <  protected:
84 >  protected:
85 >    bool initialized_;
86 >    bool doParticlePot_;
87 >    bool doHeatFlux_;
88  
89 +    virtual void setupCutoffs();
90      virtual void preCalculation();        
91      virtual void shortRangeInteractions();
92      virtual void longRangeInteractions();
93      virtual void postCalculation();
87
88    SimInfo * info_;        
89    map<Bend*, BendDataSet> bendDataSets;
90    map<Torsion*, TorsionDataSet> torsionDataSets;
91    map<Inversion*, InversionDataSet> inversionDataSets;
92    Mat3x3d tau;
94  
95 +    SimInfo* info_;        
96 +    ForceField* forceField_;
97      InteractionManager* interactionMan_;
98      ForceDecomposition* fDecomp_;
99 <    SwitchingFunction* swfun_;
99 >    SwitchingFunction* switcher_;
100 >
101 >    SwitchingFunctionType sft_;/**< Type of switching function in use */
102 >    RealType rCut_;            /**< cutoff radius for non-bonded interactions */
103 >    RealType rSwitch_;         /**< inner radius of switching function */
104 >    CutoffMethod cutoffMethod_;/**< Cutoff Method for most non-bonded interactions */
105 >    CutoffPolicy cutoffPolicy_;/**< Cutoff Policy for non-bonded interactions */
106 >
107 >    map<Bend*, BendDataSet> bendDataSets;
108 >    map<Torsion*, TorsionDataSet> torsionDataSets;
109 >    map<Inversion*, InversionDataSet> inversionDataSets;
110      vector<pair<int, int> > neighborList;
111 <    map< pair<int, int>, pair<RealType, RealType> > groupCutoffMap;    
111 >
112 >    vector<RealType> vdwScale_;
113 >    vector<RealType> electrostaticScale_;
114 >
115 >    Mat3x3d stressTensor;
116 >
117 >    vector<Perturbation*> perturbations_;
118    };
100  
119   }
120   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines