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 1711 by gezelter, Sat May 19 02:58:35 2012 UTC vs.
Revision 1868 by gezelter, Tue Apr 30 15:56:54 2013 UTC

# Line 35 | Line 35
35   *                                                                      
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).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 44 | Line 44
44   * @file ForceManager.hpp
45   * @author tlin
46   * @date 11/09/2004
47 – * @time 10:36am
47   * @version 1.0
48   */
49  
# Line 56 | Line 55
55   #include "nonbonded/Cutoffs.hpp"
56   #include "nonbonded/SwitchingFunction.hpp"
57   #include "nonbonded/InteractionManager.hpp"
58 + #include "perturbations/Perturbation.hpp"
59   #include "parallel/ForceDecomposition.hpp"
60 + #include "brains/Thermo.hpp"
61  
62   #define PREPAIR_LOOP 0
63   #define PAIR_LOOP 1
# Line 76 | Line 77 | namespace OpenMD {
77  
78    public:
79      ForceManager(SimInfo * info);                          
80 <    virtual ~ForceManager() {}
80 >    virtual ~ForceManager();
81      virtual void calcForces();
82      void initialize();
83  
84    protected:
85      bool initialized_;
86      bool doParticlePot_;
87 +    bool doElectricField_;
88 +    bool doHeatFlux_;
89 +    bool doLongRangeCorrections_;
90 +    bool usePeriodicBoundaryConditions_;
91  
92      virtual void setupCutoffs();
93      virtual void preCalculation();        
# Line 95 | Line 100 | namespace OpenMD {
100      InteractionManager* interactionMan_;
101      ForceDecomposition* fDecomp_;
102      SwitchingFunction* switcher_;
103 +    Thermo* thermo;
104  
105      SwitchingFunctionType sft_;/**< Type of switching function in use */
100 –
101 –
106      RealType rCut_;            /**< cutoff radius for non-bonded interactions */
107      RealType rSwitch_;         /**< inner radius of switching function */
108      CutoffMethod cutoffMethod_;/**< Cutoff Method for most non-bonded interactions */
109      CutoffPolicy cutoffPolicy_;/**< Cutoff Policy for non-bonded interactions */
110  
111 +    set<AtomType*> atomTypes_;
112 +    vector<pair<AtomType*, AtomType*> > interactions_;
113      map<Bend*, BendDataSet> bendDataSets;
114      map<Torsion*, TorsionDataSet> torsionDataSets;
115      map<Inversion*, InversionDataSet> inversionDataSets;
# Line 112 | Line 118 | namespace OpenMD {
118      vector<RealType> vdwScale_;
119      vector<RealType> electrostaticScale_;
120  
121 <    Mat3x3d tau;
121 >    Mat3x3d stressTensor;
122  
123 +    vector<Perturbation*> perturbations_;
124    };
125   }
126   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

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