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

Comparing branches/development/src/nonbonded/Sticky.hpp (file contents):
Revision 1709 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

# Line 44 | Line 44
44   #define NONBONDED_STICKY_HPP
45  
46   #include "nonbonded/NonBondedInteraction.hpp"
47 < #include "types/DirectionalAtomType.hpp"
47 > #include "types/StickyAdapter.hpp"
48   #include "UseTheForce/ForceField.hpp"
49   #include "math/SquareMatrix3.hpp"
50   #include "math/CubicSpline.hpp"
# Line 78 | Line 78 | namespace OpenMD {
78      
79    private:
80      void initialize();
81    StickyParam  getStickyParam(AtomType* atomType);
82
81      bool initialized_;
82      map<int, AtomType*> StickyMap;
83      map<pair<AtomType*, AtomType*>, StickyInteractionData> MixingMap;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines