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 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC vs.
branches/devel_omp/src/brains/ForceManager.hpp (file contents), Revision 1598 by mciznick, Wed Jul 27 14:26:53 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 +
60 + #define PREPAIR_LOOP 0
61 + #define PAIR_LOOP 1
62 +
63 + using namespace std;
64   namespace OpenMD {
65    /**
66     * @class ForceManager ForceManager.hpp "brains/ForceManager.hpp"
67 <   * ForceManager is responsible for calculating the short range
68 <   * 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.
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 fortran side's setup is that some
71 <   * applications (Dump2XYZ etc.) may not need force calculation, so why
72 <   * 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:
77 <    ForceManager(SimInfo * info) : info_(info), NBforcesInitialized_(false) {}
71 <        
77 >    ForceManager(SimInfo * info);                          
78      virtual ~ForceManager() {}
73
74    // public virtual functions should be avoided
75    /**@todo needs refactoring */
79      virtual void calcForces();
80 +    void initialize();
81  
82 <    virtual void init() {}
83 <  protected:
82 >  protected:
83 >    bool initialized_;
84  
85 <    virtual void preCalculation();
86 <        
87 <    virtual void calcShortRangeInteraction();
85 >    virtual void setupCutoffs();
86 >    virtual void preCalculation();        
87 >    virtual void shortRangeInteractions();
88 >    virtual void longRangeInteractions();
89 >    virtual void longRangeInteractionsRapaport();
90 >    virtual void postCalculation();
91  
92 <    virtual void calcLongRangeInteraction();
92 >    SimInfo* info_;        
93 >    ForceField* forceField_;
94 >    InteractionManager* interactionMan_;
95 >    ForceDecomposition* fDecomp_;
96 >    SwitchingFunction* switcher_;
97  
98 <    virtual void postCalculation();
88 <
89 <    SimInfo * info_;        
98 >    SwitchingFunctionType sft_;/**< Type of switching function in use */
99  
100 <    std::map<Bend*, BendDataSet> bendDataSets;
101 <    std::map<Torsion*, TorsionDataSet> torsionDataSets;
102 <    std::map<Inversion*, InversionDataSet> inversionDataSets;
100 >
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 >    map<Bend*, BendDataSet> bendDataSets;
107 >    map<Torsion*, TorsionDataSet> torsionDataSets;
108 >    map<Inversion*, InversionDataSet> inversionDataSets;
109 >    vector<pair<int, int> > neighborList;
110 >
111 >    /* Rapaport the neighbor matrix W_m_i */
112 >    vector<vector<CutoffGroup *> >neighborMatW;
113 >
114 >    vector<RealType> vdwScale_;
115 >    vector<RealType> electrostaticScale_;
116 >
117      Mat3x3d tau;
118  
96    bool NBforcesInitialized_;
97    
119    };
120 <
100 < } //end namespace OpenMD
120 > }
121   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines