ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/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 1544 by gezelter, Fri Mar 18 19:31:52 2011 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 52 | Line 52
52  
53   #include "brains/SimInfo.hpp"
54   #include "primitives/Molecule.hpp"
55 < namespace oopse {
55 > #include "nonbonded/InteractionManager.hpp"
56 > #include "parallel/Decomposition.hpp"
57 >
58 > namespace OpenMD {
59    /**
60     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
61     * ForceManager is responsible for calculating the short range
# Line 67 | Line 70 | namespace oopse {
70    class ForceManager {
71  
72    public:
73 <    ForceManager(SimInfo * info) : info_(info) {}
74 <        
73 >    
74 >    ForceManager(SimInfo * info);                          
75      virtual ~ForceManager() {}
76  
77      // public virtual functions should be avoided
78      /**@todo needs refactoring */
79 <    virtual void calcForces(bool needPotential, bool needStress);
79 >    virtual void calcForces();
80 >    virtual void init() {};
81  
78    virtual void init() {}
82    protected:
83  
84 <    virtual void preCalculation();
82 <        
84 >    virtual void preCalculation();        
85      virtual void calcShortRangeInteraction();
86 <
87 <    virtual void calcLongRangeInteraction(bool needPotential, bool needStress);
86 <
87 <    virtual void postCalculation(bool needStress);
86 >    virtual void calcLongRangeInteraction();
87 >    virtual void postCalculation();
88  
89      SimInfo * info_;        
90
90      std::map<Bend*, BendDataSet> bendDataSets;
91      std::map<Torsion*, TorsionDataSet> torsionDataSets;
92      std::map<Inversion*, InversionDataSet> inversionDataSets;
93      Mat3x3d tau;
94 +
95 +    bool NBforcesInitialized_;
96 +    InteractionManager* nbiMan_;
97 +    Decomposition* decomp_;
98      
99    };
100  
101 < } //end namespace oopse
101 > } //end namespace OpenMD
102   #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 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines