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 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC vs.
Revision 1528 by gezelter, Fri Dec 17 20:11:05 2010 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/InteractionManager.hpp"
56  
57   namespace OpenMD {
58    /**
# Line 98 | Line 92 | namespace OpenMD {
92      Mat3x3d tau;
93  
94      bool NBforcesInitialized_;
95 <    LJ* lj_;
102 <    GB* gb_;
103 <    Sticky* sticky_;
104 <    EAM* eam_;
105 <    SC* sc_;
106 <    Morse* morse_;
107 <    Electrostatic* electrostatic_;
95 >    InteractionManager* nbiMan_;
96      
97    };
98  

Diff Legend

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