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

Comparing branches/development/src/nonbonded/InteractionManager.hpp (file contents):
Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1568 by gezelter, Wed May 25 16:20:37 2011 UTC

# Line 44 | Line 44
44  
45   #include "brains/SimInfo.hpp"
46   #include "types/AtomType.hpp"
47 – #include "UseTheForce/ForceField.hpp"
47   #include "nonbonded/LJ.hpp"
48   #include "nonbonded/GB.hpp"
49   #include "nonbonded/Sticky.hpp"
# Line 52 | Line 51
51   #include "nonbonded/SC.hpp"
52   #include "nonbonded/Morse.hpp"
53   #include "nonbonded/Electrostatic.hpp"
54 + #include "nonbonded/MAW.hpp"
55 + #include "nonbonded/SwitchingFunction.hpp"
56  
57   using namespace std;
58  
59   namespace OpenMD {
60 +  enum CutoffMethod {
61 +    HARD,
62 +    SWITCHED,
63 +    SHIFTED_POTENTIAL,
64 +    SHIFTED_FORCE
65 +  };
66 +
67    /**
68     * @class InteractionManager InteractionManager is responsible for
69     * keeping track of the non-bonded interactions (C++) and providing
# Line 65 | Line 73 | namespace OpenMD {
73  
74    public:
75      static InteractionManager* Instance();
76 <    static void setForceField(ForceField *ff) {forceField_ = ff;};    
76 >    static void setSimInfo(SimInfo* info) {info_ = info;}
77 >    static void initialize();
78  
70 –
71 –
79      // Fortran support routines
80  
81 <    static void doPrePair(int *atid1, int *atid2, RealType *rij, RealType *rho_i_at_j, RealType *rho_j_at_i);
82 <    static void doPreForce(int *atid, RealType *rho, RealType *frho, RealType *dfrhodrho);
83 <    static void doPair(int *atid1, int *atid2, RealType *d, RealType *r, RealType *r2, RealType *rcut, RealType *sw, RealType *vdwMult,RealType *electroMult, RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1, RealType *eFrame2, RealType *A1, RealType *A2, RealType *t1, RealType *t2, RealType *rho1, RealType *rho2, RealType *dfrho1, RealType *dfrho2, RealType *fshift1, RealType *fshift2);    
84 <    static void doSkipCorrection(int *atid1, int *atid2, RealType *d, RealType *r, RealType *skippedCharge1, RealType *skippedCharge2, RealType *sw, RealType *electroMult, RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1, RealType *eFrame2, RealType *t1, RealType *t2);
85 <    static void doSelfCorrection(int *atid, RealType *eFrame, RealType *skippedCharge, RealType *pot, RealType *t);
81 >    static void doPrePair(InteractionData idat);
82 >    static void doPreForce(SelfData sdat);
83 >    static void doPair(InteractionData idat);    
84 >    static void doSkipCorrection(InteractionData idat);
85 >    static void doSelfCorrection(SelfData sdat);
86      static RealType getSuggestedCutoffRadius(int *atid1);  
87 +    static RealType getSuggestedCutoffRadius(AtomType *atype);
88 +    SwitchingFunction* getSwitchingFunction() {return switcher_;}
89      
90    private:
91      virtual ~InteractionManager() { }
# Line 86 | Line 95 | namespace OpenMD {
95      InteractionManager& operator=(InteractionManager const&) {};
96      static InteractionManager* _instance;
97  
89 –    static void initialize();
98      static bool initialized_;
99  
100 <    static ForceField* forceField_;
100 >    static void setupCutoffs();
101 >    static void setupSwitching();
102 >    static void setupElectrostatics();
103 >
104 >    static SimInfo* info_;
105      static LJ* lj_;
106      static GB* gb_;
107      static Sticky* sticky_;
# Line 97 | Line 109 | namespace OpenMD {
109      static SC* sc_;
110      static Morse* morse_;
111      static Electrostatic* electrostatic_;
112 +    static MAW* maw_;
113 +    static SwitchingFunction* switcher_;
114  
115 +    static RealType rCut_;            /**< cutoff radius for non-bonded interactions */
116 +    static RealType rSwitch_;         /**< inner radius of switching function */
117 +    static CutoffMethod cutoffMethod_;/**< Cutoff Method for most non-bonded interactions */
118 +    static SwitchingFunctionType sft_;/**< Type of switching function in use */
119 +
120 +    static RealType vdwScale_[4];
121 +    static RealType electrostaticScale_[4];
122 +  
123      static map<int, AtomType*> typeMap_;
124      /**
125       * Each pair of atom types can have multiple interactions, so the
126       * natural data structures are a map between the pair, and a set
127       * of non-bonded interactions.
128       */
129 <    static map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > interactions_;
108 <    
129 >    static map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > interactions_;    
130    };
131   }
132   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines