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

Comparing branches/development/src/parallel/ForceDecomposition.hpp (file contents):
Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC vs.
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef PARALLEL_FORCEDECOMPOSITION_HPP
44   #define PARALLEL_FORCEDECOMPOSITION_HPP
45  
46   #include "brains/SimInfo.hpp"
47 + #include "brains/SnapshotManager.hpp"
48   #include "nonbonded/NonBondedInteraction.hpp"
49 + #include "nonbonded/Cutoffs.hpp"
50 + #include "nonbonded/InteractionManager.hpp"
51 + #include "utils/Tuple.hpp"
52  
53   using namespace std;
54   namespace OpenMD {
55    
56 +  typedef tuple3<RealType, RealType, RealType> groupCutoffs;
57 +
58    /**
59     * @class ForceDecomposition
60     *
# Line 85 | Line 92 | namespace OpenMD {
92    class ForceDecomposition {
93    public:
94  
95 <    ForceDecomposition(SimInfo* info) : info_(info) {}
95 >    ForceDecomposition(SimInfo* info, InteractionManager* iMan);
96      virtual ~ForceDecomposition() {}
97      
98      virtual void distributeInitialData() = 0;
99      virtual void distributeData() = 0;
100 +    virtual void zeroWorkArrays() = 0;
101      virtual void collectIntermediateData() = 0;
102      virtual void distributeIntermediateData() = 0;
103      virtual void collectData() = 0;
104 +    virtual potVec* getEmbeddingPotential() { return &embeddingPot; }
105 +    virtual potVec* getPairwisePotential() { return &pairwisePot; }
106  
107      // neighbor list routines
108 <    virtual bool checkNeighborList() = 0;
108 >    virtual bool checkNeighborList();
109      virtual vector<pair<int, int> >  buildNeighborList() = 0;
110  
111 +    // how to handle cutoffs:
112 +    void setCutoffPolicy(CutoffPolicy cp) {cutoffPolicy_ = cp;}
113 +    void setUserCutoff(RealType rcut) {userCutoff_ = rcut; userChoseCutoff_ = true; }
114 +
115      // group bookkeeping
116 <    virtual pair<int, int> getGroupTypes(int cg1, int cg2) = 0;
116 >    virtual groupCutoffs getGroupCutoffs(int cg1, int cg2) = 0;
117  
118      // Group->atom bookkeeping
119 <    virtual vector<int> getAtomsInGroupRow(int cg1) = 0;
119 >    virtual vector<int> getAtomsInGroupRow(int cg1) = 0;
120      virtual vector<int> getAtomsInGroupColumn(int cg2) = 0;
121 +
122      virtual Vector3d getAtomToGroupVectorRow(int atom1, int cg1) = 0;
123      virtual Vector3d getAtomToGroupVectorColumn(int atom2, int cg2) = 0;
124 <    virtual RealType getMfactRow(int atom1) = 0;
125 <    virtual RealType getMfactColumn(int atom2) = 0;
124 >    virtual RealType getMassFactorRow(int atom1) = 0;
125 >    virtual RealType getMassFactorColumn(int atom2) = 0;
126  
127      // spatial data
128      virtual Vector3d getIntergroupVector(int cg1, int cg2) = 0;
129      virtual Vector3d getInteratomicVector(int atom1, int atom2) = 0;
130        
131      // atom bookkeeping
132 <    virtual vector<int> getAtomList() = 0;
133 <    virtual vector<int> getSkipsForAtom(int atom1) = 0;
132 >    virtual int getNAtomsInRow() = 0;
133 >    virtual vector<int> getExcludesForAtom(int atom1) = 0;
134      virtual bool skipAtomPair(int atom1, int atom2) = 0;
135 +    virtual bool excludeAtomPair(int atom1, int atom2) = 0;
136 +    virtual int getTopologicalDistance(int atom1, int atom2) = 0;
137      virtual void addForceToAtomRow(int atom1, Vector3d fg) = 0;
138      virtual void addForceToAtomColumn(int atom2, Vector3d fg) = 0;
139  
140 +
141      // filling interaction blocks with pointers
142 <    virtual InteractionData fillInteractionData(int atom1, int atom2) = 0;
143 <    virtual InteractionData fillSkipData(int atom1, int atom2) = 0;
144 <    virtual SelfData fillSelfData(int atom1) = 0;
142 >    virtual void fillInteractionData(InteractionData &idat, int atom1, int atom2) = 0;
143 >    virtual void unpackInteractionData(InteractionData &idat, int atom1, int atom2) = 0;
144 >
145 >    virtual void fillSelfData(SelfData &sdat, int atom1);
146      
147    protected:
148      SimInfo* info_;  
149 <    map<pair<int, int>, int> topoDist; //< topoDist gives the
150 <                                       //topological distance between
151 <                                       //two atomic sites.  This
152 <                                       //declaration is agnostic
153 <                                       //regarding the parallel
154 <                                       //decomposition.  The two
155 <                                       //indices could be local or row
156 <                                       //& column.  It will be up to
157 <                                       //the specific decomposition
158 <                                       //method to fill this.
159 <    map<pair<int, int>, bool> exclude; //< exclude is the set of pairs
160 <                                       //to leave out of non-bonded
161 <                                       //force evaluations.  This
162 <                                       //declaration is agnostic
163 <                                       //regarding the parallel
164 <                                       //decomposition.  The two
165 <                                       //indices could be local or row
166 <                                       //& column.  It will be up to
167 <                                       //the specific decomposition
168 <                                       //method to fill this.
149 >    SnapshotManager* sman_;    
150 >    Snapshot* snap_;
151 >    ForceField* ff_;
152 >    InteractionManager* interactionMan_;
153 >
154 >    int storageLayout_;
155 >    RealType skinThickness_;   /**< Verlet neighbor list skin thickness */    
156 >    RealType largestRcut_;
157 >
158 >    vector<int> idents;
159 >    potVec pairwisePot;
160 >    potVec embeddingPot;
161 >
162 >    /**
163 >     * The topological distance between two atomic sites is handled
164 >     * via two vector structures for speed.  These structures agnostic
165 >     * regarding the parallel decomposition.  The index for
166 >     * toposForAtom could be local or row, while the values could be
167 >     * local or column.  It will be up to the specific decomposition
168 >     * method to fill these.
169 >     */
170 >    vector<vector<int> > toposForAtom;
171 >    vector<vector<int> > topoDist;                                      
172 >    vector<vector<int> > excludesForAtom;
173 >    vector<vector<int> > groupList_;
174 >    vector<RealType> massFactors;
175 >    vector<AtomType*> atypesLocal;
176 >
177 >    vector<Vector3i> cellOffsets_;
178 >    Vector3i nCells_;
179 >    vector<vector<int> > cellList_;
180 >    vector<Vector3d> saved_CG_positions_;
181 >
182 >    bool userChoseCutoff_;
183 >    RealType userCutoff_;
184 >    CutoffPolicy cutoffPolicy_;
185 >
186 >    map<pair<int, int>, tuple3<RealType, RealType, RealType> > gTypeCutoffMap;
187 >
188    };    
189   }
190   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines