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 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 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
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) {}
71 <        
79 >    ForceManager(SimInfo * info);                          
80      virtual ~ForceManager() {}
81 +    virtual void calcForces();
82 +    void initialize();
83  
84 <    // public virtual functions should be avoided
85 <    /**@todo needs refactoring */
86 <    virtual void calcForces(bool needPotential, bool needStress);
84 >  protected:
85 >    bool initialized_;
86 >    bool doParticlePot_;
87 >    bool doHeatFlux_;
88  
89 <    virtual void init() {}
90 <  protected:
89 >    virtual void setupCutoffs();
90 >    virtual void preCalculation();        
91 >    virtual void shortRangeInteractions();
92 >    virtual void longRangeInteractions();
93 >    virtual void postCalculation();
94  
95 <    virtual void preCalculation();
96 <        
97 <    virtual void calcShortRangeInteraction();
95 >    SimInfo* info_;        
96 >    ForceField* forceField_;
97 >    InteractionManager* interactionMan_;
98 >    ForceDecomposition* fDecomp_;
99 >    SwitchingFunction* switcher_;
100  
101 <    virtual void calcLongRangeInteraction(bool needPotential, bool needStress);
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 <    virtual void postCalculation(bool needStress);
108 <
109 <    SimInfo * info_;        
107 >    map<Bend*, BendDataSet> bendDataSets;
108 >    map<Torsion*, TorsionDataSet> torsionDataSets;
109 >    map<Inversion*, InversionDataSet> inversionDataSets;
110 >    vector<pair<int, int> > neighborList;
111  
112 <    std::map<Bend*, BendDataSet> bendDataSets;
113 <    std::map<Torsion*, TorsionDataSet> torsionDataSets;
93 <    std::map<Inversion*, InversionDataSet> inversionDataSets;
94 <    Mat3x3d tau;
95 <    
96 <  };
112 >    vector<RealType> vdwScale_;
113 >    vector<RealType> electrostaticScale_;
114  
115 < } //end namespace OpenMD
115 >    Mat3x3d stressTensor;
116 >
117 >    vector<Perturbation*> perturbations_;
118 >  };
119 > }
120   #endif //BRAINS_FORCEMANAGER_HPP

Comparing trunk/src/brains/ForceManager.hpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines