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

Comparing:
trunk/src/brains/ForceManager.hpp (file contents), Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/brains/ForceManager.hpp (file contents), Revision 1723 by gezelter, Thu May 24 20:59:54 2012 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
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]  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 < namespace oopse {
56 > #include "nonbonded/Cutoffs.hpp"
57 > #include "nonbonded/SwitchingFunction.hpp"
58 > #include "nonbonded/InteractionManager.hpp"
59 > #include "parallel/ForceDecomposition.hpp"
60 >
61 > #define PREPAIR_LOOP 0
62 > #define PAIR_LOOP 1
63 >
64 > using namespace std;
65 > namespace OpenMD {
66    /**
67     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
68 <   * ForceManager is responsible for calculating the short range
69 <   * 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.
68 >   * ForceManager is responsible for calculating both the short range
69 >   * (bonded) interactions and long range (non-bonded) interactions.
70     *
71 <   * @note the reason we delay fortran side's setup is that some
72 <   * applications (Dump2XYZ etc.) may not need force calculation, so why
73 <   * bother?
71 >   * @note the reason we delay some of the setup is that
72 >   * initialization must wait until after the force field has been
73 >   * parsed so that the atom types are known.
74     */
75    class ForceManager {
76  
77    public:
78 <    ForceManager(SimInfo * info) : info_(info) {}
71 <        
78 >    ForceManager(SimInfo * info);                          
79      virtual ~ForceManager() {}
80 +    virtual void calcForces();
81 +    void initialize();
82  
83 <    // public virtual functions should be avoided
84 <    /**@todo needs refactoring */
85 <    virtual void calcForces(bool needPotential, bool needStress);
83 >  protected:
84 >    bool initialized_;
85 >    bool doParticlePot_;
86 >    bool doHeatFlux_;
87  
88 <    virtual void init() {}
89 <  protected:
88 >    virtual void setupCutoffs();
89 >    virtual void preCalculation();        
90 >    virtual void shortRangeInteractions();
91 >    virtual void longRangeInteractions();
92 >    virtual void postCalculation();
93  
94 <    virtual void preCalculation();
95 <        
96 <    virtual void calcShortRangeInteraction();
94 >    SimInfo* info_;        
95 >    ForceField* forceField_;
96 >    InteractionManager* interactionMan_;
97 >    ForceDecomposition* fDecomp_;
98 >    SwitchingFunction* switcher_;
99  
100 <    virtual void calcLongRangeInteraction(bool needPotential, bool needStress);
100 >    SwitchingFunctionType sft_;/**< Type of switching function in use */
101 >    RealType rCut_;            /**< cutoff radius for non-bonded interactions */
102 >    RealType rSwitch_;         /**< inner radius of switching function */
103 >    CutoffMethod cutoffMethod_;/**< Cutoff Method for most non-bonded interactions */
104 >    CutoffPolicy cutoffPolicy_;/**< Cutoff Policy for non-bonded interactions */
105  
106 <    virtual void postCalculation(bool needStress);
107 <
108 <    SimInfo * info_;        
106 >    map<Bend*, BendDataSet> bendDataSets;
107 >    map<Torsion*, TorsionDataSet> torsionDataSets;
108 >    map<Inversion*, InversionDataSet> inversionDataSets;
109 >    vector<pair<int, int> > neighborList;
110  
111 <    std::map<Bend*, BendDataSet> bendDataSets;
112 <    std::map<Torsion*, TorsionDataSet> torsionDataSets;
93 <    std::map<Inversion*, InversionDataSet> inversionDataSets;
94 <    Mat3x3d tau;
95 <    
96 <  };
111 >    vector<RealType> vdwScale_;
112 >    vector<RealType> electrostaticScale_;
113  
114 < } //end namespace oopse
114 >    Mat3x3d stressTensor;
115 >  };
116 > }
117   #endif //BRAINS_FORCEMANAGER_HPP

Comparing:
trunk/src/brains/ForceManager.hpp (property svn:keywords), Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/brains/ForceManager.hpp (property svn:keywords), Revision 1723 by gezelter, Thu May 24 20:59:54 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines