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 1545 by gezelter, Fri Apr 8 21:25:19 2011 UTC vs.
Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC

# Line 53 | Line 53
53   #include "brains/SimInfo.hpp"
54   #include "primitives/Molecule.hpp"
55   #include "nonbonded/InteractionManager.hpp"
56 < #include "parallel/Decomposition.hpp"
56 > #include "parallel/ForceDecomposition.hpp"
57  
58   #define PREPAIR_LOOP 0
59   #define PAIR_LOOP 1
# Line 81 | Line 81 | namespace OpenMD {
81    protected:
82  
83      virtual void preCalculation();        
84 <    virtual void calcShortRangeInteraction();
85 <    virtual void calcLongRangeInteraction();
84 >    virtual void shortRangeInteractions();
85 >    virtual void longRangeInteractions();
86      virtual void postCalculation();
87  
88      SimInfo * info_;        
# Line 91 | Line 91 | namespace OpenMD {
91      map<Inversion*, InversionDataSet> inversionDataSets;
92      Mat3x3d tau;
93  
94 <    vector<pair<int, int> > neighborList_;
95 <
96 <    InteractionManager* nbiMan_;
97 <    Decomposition* decomp_;
98 <    
94 >    InteractionManager* interactionMan_;
95 >    ForceDecomposition* fDecomp_;
96 >    SwitchingFunction* swfun_;
97 >    vector<pair<int, int> > neighborList;
98 >    map< pair<int, int>, pair<RealType, RealType> > groupCutoffMap;    
99    };
100    
101   }

Diff Legend

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