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 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/brains/ForceManager.hpp (file contents), Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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 < /**
43 <  * @file ForceManager.hpp
44 <  * @author tlin
45 <  * @date 11/09/2004
46 <  * @time 10:36am
47 <  * @version 1.0
48 <  */
42 > /**
43 > * @file ForceManager.hpp
44 > * @author tlin
45 > * @date 11/09/2004
46 > * @time 10:36am
47 > * @version 1.0
48 > */
49  
50   #ifndef BRAINS_FORCEMANAGER_HPP
51   #define BRAINS_FORCEMANAGER_HPP
52  
53   #include "brains/SimInfo.hpp"
54 + #include "primitives/Molecule.hpp"
55 + #include "nonbonded/InteractionManager.hpp"
56 + #include "parallel/ForceDecomposition.hpp"
57  
58 < namespace oopse {
58 > #define PREPAIR_LOOP 0
59 > #define PAIR_LOOP 1
60  
61 < /**
62 < * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
63 < * ForceManager is responsible for calculating the short range interactions (c++) and
64 < * long range interactions(fortran). If fortran side is not setup before the force calculation,
65 < * call SimInfo's update function to settle it down.
66 < * @note the reason we delay fortran side's setup is that some applications (Dump2XYZ etc.)
67 < * may not need force calculation, why bother?
68 < */
69 < class ForceManager {
61 > using namespace std;
62 > namespace OpenMD {
63 >  /**
64 >   * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
65 >   * ForceManager is responsible for calculating the short range
66 >   * interactions and long range interactions.
67 >   *
68 >   * @note the reason we delay some of the setup is that some
69 >   * applications (Dump2XYZ etc.) may not need force calculation, so
70 >   * why bother?
71 >   */
72 >  class ForceManager {
73  
74 <    public:
75 <        ForceManager(SimInfo * info) : info_(info) {}
76 <        
77 <        virtual ~ForceManager() {}
74 >  public:
75 >    
76 >    ForceManager(SimInfo * info);                          
77 >    virtual ~ForceManager() {}
78 >    virtual void calcForces();
79 >    virtual void init() {};
80  
81 <        //public virtual function should be avoided
73 <        /**@todo need refactory */
74 <        virtual void calcForces(bool needPotential, bool needStress);
81 >  protected:
82  
83 <        virtual void init() {}
84 <    protected:
85 <
86 <        virtual void preCalculation();
80 <        
81 <        virtual void calcShortRangeInteraction();
82 <
83 <        virtual void calcLongRangeInteraction(bool needPotential, bool needStress);
84 <
85 <        virtual void postCalculation();
83 >    virtual void preCalculation();        
84 >    virtual void shortRangeInteractions();
85 >    virtual void longRangeInteractions();
86 >    virtual void postCalculation();
87  
88 <        SimInfo * info_;        
88 >    SimInfo * info_;        
89 >    map<Bend*, BendDataSet> bendDataSets;
90 >    map<Torsion*, TorsionDataSet> torsionDataSets;
91 >    map<Inversion*, InversionDataSet> inversionDataSets;
92 >    Mat3x3d tau;
93  
94 < };
95 <
96 < } //end namespace oopse
94 >    InteractionManager* interactionMan_;
95 >    ForceDecomposition* fDecomp_;
96 >    SwitchingFunction* swfun_;
97 >    vector<pair<int, int> > neighborList;
98 >    map< pair<int, int>, pair<RealType, RealType> > groupCutoffMap;    
99 >  };
100 >  
101 > }
102   #endif //BRAINS_FORCEMANAGER_HPP

Comparing:
trunk/src/brains/ForceManager.hpp (property svn:keywords), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/brains/ForceManager.hpp (property svn:keywords), Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines