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

Comparing branches/development/src/brains/ForceManager.hpp (file contents):
Revision 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC vs.
Revision 1576 by gezelter, Wed Jun 8 16:05:07 2011 UTC

# Line 52 | Line 52
52  
53   #include "brains/SimInfo.hpp"
54   #include "primitives/Molecule.hpp"
55 < #include "nonbonded/LJ.hpp"
56 < #include "nonbonded/GB.hpp"
57 < #include "nonbonded/Sticky.hpp"
58 < #include "nonbonded/EAM.hpp"
59 < #include "nonbonded/SC.hpp"
60 < #include "nonbonded/Morse.hpp"
61 < #include "nonbonded/Electrostatic.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
68 <   * Fortran side is not set up before the force calculation, call
69 <   * 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:
78    
77      ForceManager(SimInfo * info);                          
78      virtual ~ForceManager() {}
81
82    // public virtual functions should be avoided
83    /**@todo needs refactoring */
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 setupSwitching();
87      virtual void preCalculation();        
88 <    virtual void calcShortRangeInteraction();
89 <    virtual void calcLongRangeInteraction();
88 >    virtual void shortRangeInteractions();
89 >    virtual void longRangeInteractions();
90      virtual void postCalculation();
91 <
92 <    SimInfo * info_;        
93 <    std::map<Bend*, BendDataSet> bendDataSets;
94 <    std::map<Torsion*, TorsionDataSet> torsionDataSets;
95 <    std::map<Inversion*, InversionDataSet> inversionDataSets;
91 >
92 >    SimInfo* info_;        
93 >    ForceField* forceField_;
94 >    InteractionManager* interactionMan_;
95 >    ForceDecomposition* fDecomp_;
96 >    SwitchingFunction* switcher_;
97 >
98 >    SwitchingFunctionType sft_;/**< Type of switching function in use */
99 >
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 >    vector<RealType> vdwScale_;
112 >    vector<RealType> electrostaticScale_;
113 >
114      Mat3x3d tau;
115  
100    bool NBforcesInitialized_;
101    LJ* lj_;
102    GB* gb_;
103    Sticky* sticky_;
104    EAM* eam_;
105    SC* sc_;
106    Morse* morse_;
107    Electrostatic* electrostatic_;
108    
116    };
117 <
111 < } //end namespace OpenMD
117 > }
118   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines