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 1587 by gezelter, Fri Jul 8 20:25:32 2011 UTC vs.
branches/devel_omp/src/brains/ForceManager.hpp (file contents), Revision 1595 by chuckv, Tue Jul 19 18:50:04 2011 UTC

# Line 86 | Line 86 | namespace OpenMD {
86      virtual void preCalculation();        
87      virtual void shortRangeInteractions();
88      virtual void longRangeInteractions();
89 +    virtual void longRangeInteractionsRapaport();
90      virtual void postCalculation();
91  
92      SimInfo* info_;        
# Line 107 | Line 108 | namespace OpenMD {
108      map<Inversion*, InversionDataSet> inversionDataSets;
109      vector<pair<int, int> > neighborList;
110  
111 +    /* Rapaport the neighbor matrix W_m_i */
112 +    vector<vector<int> >neighborMatW;
113 +
114      vector<RealType> vdwScale_;
115      vector<RealType> electrostaticScale_;
116  

Diff Legend

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