ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/parallel/ForceDecomposition.hpp
(Generate patch)

Comparing trunk/src/parallel/ForceDecomposition.hpp (file contents):
Revision 1929 by gezelter, Mon Aug 19 13:12:00 2013 UTC vs.
Revision 2057 by gezelter, Tue Mar 3 15:22:26 2015 UTC

# Line 46 | Line 46
46   #include "brains/SimInfo.hpp"
47   #include "brains/SnapshotManager.hpp"
48   #include "nonbonded/NonBondedInteraction.hpp"
49 #include "nonbonded/Cutoffs.hpp"
49   #include "nonbonded/InteractionManager.hpp"
50   #include "utils/Tuple.hpp"
51  
52   using namespace std;
53 < namespace OpenMD {
55 <  
56 <  typedef tuple3<RealType, RealType, RealType> groupCutoffs;
53 > namespace OpenMD {
54  
55    /**
56     * @class ForceDecomposition
# Line 113 | Line 110 | namespace OpenMD {
110  
111      // neighbor list routines
112      virtual bool checkNeighborList();
113 <    virtual void buildNeighborList(vector<pair<int, int> >& neighborList) = 0;
113 >    virtual void buildNeighborList(vector<int>& neighborList, vector<int>& point) = 0;
114  
115 <    // how to handle cutoffs:
116 <    void setCutoffPolicy(CutoffPolicy cp) {cutoffPolicy_ = cp;}
120 <    void setUserCutoff(RealType rcut) {userCutoff_ = rcut; userChoseCutoff_ = true; }
121 <
115 >    void setCutoffRadius(RealType rCut);
116 >    
117      // group bookkeeping
123    virtual void getGroupCutoffs(int &cg1, int &cg2, RealType &rcut, RealType &rcutsq, RealType &rlistsq) = 0;
118      virtual Vector3d& getGroupVelocityColumn(int atom2) = 0;
119  
120      // Group->atom bookkeeping
# Line 147 | Line 141 | namespace OpenMD {
141      virtual Vector3d& getAtomVelocityColumn(int atom2) = 0;
142  
143      // filling interaction blocks with pointers
144 <    virtual void fillInteractionData(InteractionData &idat, int atom1, int atom2) = 0;
144 >    virtual void fillInteractionData(InteractionData &idat, int atom1, int atom2, bool newAtom1 = true) = 0;
145      virtual void unpackInteractionData(InteractionData &idat, int atom1, int atom2) = 0;
146  
147      virtual void fillSelfData(SelfData &sdat, int atom1);
# Line 165 | Line 159 | namespace OpenMD {
159      int storageLayout_;
160      bool needVelocities_;
161      bool usePeriodicBoundaryConditions_;
162 <    RealType skinThickness_;   /**< Verlet neighbor list skin thickness */    
163 <    RealType largestRcut_;
162 >    RealType skinThickness_;   /**< Verlet neighbor list skin thickness */
163 >    RealType rCut_;
164 >    RealType rList_;
165 >    RealType rListSq_;
166  
167      vector<int> idents;
168      vector<int> regions;
# Line 194 | Line 190 | namespace OpenMD {
190      Vector3i nCells_;
191      vector<vector<int> > cellList_;
192      vector<Vector3d> saved_CG_positions_;
197
198    bool userChoseCutoff_;
199    RealType userCutoff_;
200    CutoffPolicy cutoffPolicy_;
201
202    //map<pair<int, int>, tuple3<RealType, RealType, RealType> > gTypeCutoffMap;
203    vector<vector<RealType> > GrCut;
204    vector<vector<RealType> > GrCutSq;
205    vector<vector<RealType> > GrlistSq;
206
193    };    
194   }
195   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines