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

Comparing branches/development/src/nonbonded/SC.hpp (file contents):
Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

# Line 36 | Line 36
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).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef NONBONDED_SC_HPP
# Line 45 | Line 46
46   #include "nonbonded/NonBondedInteraction.hpp"
47   #include "UseTheForce/ForceField.hpp"
48   #include "math/CubicSpline.hpp"
49 + #include "types/SuttonChenAdapter.hpp"
50  
51   namespace OpenMD {
52  
# Line 76 | Line 78 | namespace OpenMD {
78      void setForceField(ForceField *ff) {forceField_ = ff;};
79      void addType(AtomType* atomType);
80      void addExplicitInteraction(AtomType* atype1, AtomType* atype2, RealType epsilon, RealType m, RealType n, RealType alpha);
81 <    void calcDensity(DensityData ddat);
82 <    void calcFunctional(FunctionalData fdat);
83 <    void calcForce(InteractionData idat);
81 >    void calcDensity(InteractionData &idat);
82 >    void calcFunctional(SelfData &sdat);
83 >    void calcForce(InteractionData &idat);
84      virtual string getName() {return name_;}
85 <    virtual RealType getSuggestedCutoffRadius(AtomType* at1, AtomType* at2);
85 >    virtual RealType getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes);
86    
87    private:
88      void initialize();
87    SCParam getSCParam(AtomType* atomType);
88    RealType getC(AtomType* atomType);
89    RealType getM(AtomType* atomType);
90    RealType getN(AtomType* atomType);
91    RealType getAlpha(AtomType* atomType);
92    RealType getEpsilon(AtomType* atomType);
89      RealType getAlpha(AtomType* atomType1, AtomType* atomType2);
90      RealType getEpsilon(AtomType* atomType1, AtomType* atomType2);
91      RealType getM(AtomType* atomType1, AtomType* atomType2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines