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

Comparing:
branches/development/src/brains/ForceManager.hpp (file contents), Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC vs.
branches/devel_omp/src/brains/ForceManager.hpp (file contents), Revision 1608 by mciznick, Tue Aug 9 01:58:56 2011 UTC

# 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 "parallel/ForceDecomposition.hpp"
59  
# Line 62 | Line 64 | namespace OpenMD {
64   namespace OpenMD {
65    /**
66     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
67 <   * ForceManager is responsible for calculating the short range
68 <   * interactions and long range interactions.
67 >   * ForceManager is responsible for calculating both the short range
68 >   * (bonded) interactions and long range (non-bonded) interactions.
69     *
70 <   * @note the reason we delay some of the setup is that some
71 <   * applications (Dump2XYZ etc.) may not need force calculation, so
72 <   * why bother?
70 >   * @note the reason we delay some of the setup is that
71 >   * initialization must wait until after the force field has been
72 >   * parsed so that the atom types are known.
73     */
74    class ForceManager {
75  
76    public:
75    
77      ForceManager(SimInfo * info);                          
78      virtual ~ForceManager() {}
79      virtual void calcForces();
80 <    virtual void init() {};
80 >    void initialize();
81  
82 <  protected:
82 >  protected:
83 >    bool initialized_;
84  
85 +    virtual void setupCutoffs();
86      virtual void preCalculation();        
87      virtual void shortRangeInteractions();
88      virtual void longRangeInteractions();
89 +    virtual void longRangeInteractionsParallel();
90 +    virtual void longRangeInteractionsRapaport();
91      virtual void postCalculation();
92 <
93 <    SimInfo * info_;        
92 >
93 >    SimInfo* info_;        
94 >    ForceField* forceField_;
95 >    InteractionManager* interactionMan_;
96 >    ForceDecomposition* fDecomp_;
97 >    SwitchingFunction* switcher_;
98 >
99 >    SwitchingFunctionType sft_;/**< Type of switching function in use */
100 >
101 >
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      map<Bend*, BendDataSet> bendDataSets;
108      map<Torsion*, TorsionDataSet> torsionDataSets;
109      map<Inversion*, InversionDataSet> inversionDataSets;
110 +    vector<pair<int, int> > neighborList;
111 +
112 +    /* Rapaport the neighbor matrix W_m_i */
113 +    vector<vector<CutoffGroup *> >neighborMatW;
114 +
115 +    vector<RealType> vdwScale_;
116 +    vector<RealType> electrostaticScale_;
117 +
118      Mat3x3d tau;
119  
94    InteractionManager* interactionMan_;
95    ForceDecomposition* fDecomp_;
96    SwitchingFunction* swfun_;
97    vector<pair<int, int> > neighborList;
98    map< pair<int, int>, pair<RealType, RealType> > groupCutoffMap;    
120    };
100  
121   }
122   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines