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

Comparing trunk/src/brains/ForceManager.hpp (file contents):
Revision 1464 by gezelter, Fri Jul 9 19:29:05 2010 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 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).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
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   */
42  
43   /**
44   * @file ForceManager.hpp
45   * @author tlin
46   * @date 11/09/2004
46 * @time 10:36am
47   * @version 1.0
48   */
49  
# Line 52 | Line 52
52  
53   #include "brains/SimInfo.hpp"
54   #include "primitives/Molecule.hpp"
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
64 +
65 + using namespace std;
66   namespace OpenMD {
67    /**
68     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
69 <   * ForceManager is responsible for calculating the short range
70 <   * interactions (C++) and long range interactions (Fortran). If the
60 <   * Fortran side is not set up before the force calculation, call
61 <   * SimInfo's update function to settle it down.
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 fortran side's setup is that some
73 <   * applications (Dump2XYZ etc.) may not need force calculation, so why
74 <   * 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:
79 <    ForceManager(SimInfo * info) : info_(info) {}
80 <        
72 <    virtual ~ForceManager() {}
73 <
74 <    // public virtual functions should be avoided
75 <    /**@todo needs refactoring */
79 >    ForceManager(SimInfo * info);                          
80 >    virtual ~ForceManager();
81      virtual void calcForces();
82 +    void initialize();
83  
84 <    virtual void init() {}
85 <  protected:
84 >  protected:
85 >    bool initialized_;
86 >    bool doParticlePot_;
87 >    bool doElectricField_;
88 >    bool doHeatFlux_;
89 >    bool doLongRangeCorrections_;
90 >    bool usePeriodicBoundaryConditions_;
91  
92 <    virtual void preCalculation();
93 <        
94 <    virtual void calcShortRangeInteraction();
92 >    virtual void setupCutoffs();
93 >    virtual void preCalculation();        
94 >    virtual void shortRangeInteractions();
95 >    virtual void longRangeInteractions();
96 >    virtual void postCalculation();
97  
98 <    virtual void calcLongRangeInteraction();
98 >    SimInfo* info_;        
99 >    ForceField* forceField_;
100 >    InteractionManager* interactionMan_;
101 >    ForceDecomposition* fDecomp_;
102 >    SwitchingFunction* switcher_;
103 >    Thermo* thermo;
104  
105 <    virtual void postCalculation();
106 <
107 <    SimInfo * info_;        
105 >    SwitchingFunctionType sft_;/**< Type of switching function in use */
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 <    std::map<Bend*, BendDataSet> bendDataSets;
112 <    std::map<Torsion*, TorsionDataSet> torsionDataSets;
113 <    std::map<Inversion*, InversionDataSet> inversionDataSets;
114 <    Mat3x3d tau;
115 <    
116 <  };
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;
116 >    vector<pair<int, int> > neighborList;
117  
118 < } //end namespace OpenMD
118 >    vector<RealType> vdwScale_;
119 >    vector<RealType> electrostaticScale_;
120 >
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