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

Comparing:
branches/development/src/parallel/ForceDecomposition.hpp (file contents), Revision 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC vs.
trunk/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1930 by gezelter, Mon Aug 19 13:51:04 2013 UTC

# Line 35 | Line 35
35   *                                                                      
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).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
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
43 > #ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
44 > #define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
45  
46 < #include "Parallel/Decomposition.hpp"
46 > #include "parallel/ForceDecomposition.hpp"
47   #include "math/SquareMatrix3.hpp"
48 + #include "brains/Snapshot.hpp"
49  
50   #ifdef IS_MPI
51 < #include "Parallel/Communicator.hpp"
51 > #include "parallel/Communicator.hpp"
52   #endif
53  
54   using namespace std;
55   namespace OpenMD {
56    
57 <  class ForceDecomposition : public Decomposition {
57 >  class ForceMatrixDecomposition : public ForceDecomposition {
58    public:
59 <    ForceDecomposition(SimInfo* info) : Decomposition(info) {sman_ = info_->getSnapshotManager();}
59 >    ForceMatrixDecomposition(SimInfo* info, InteractionManager* iMan);
60 >
61      void distributeInitialData();
62 +    void zeroWorkArrays();
63      void distributeData();
64      void collectIntermediateData();
65      void distributeIntermediateData();
66 +    void collectSelfData();
67      void collectData();
68  
69 <    unsigned int getNcutoffGroupsI();
70 <    unsigned int getNcutoffGroupsJ();
69 >    // neighbor list routines
70 >    void buildNeighborList(vector<pair<int, int> >& neighborList);
71  
72 <    vector<int> getAtomsInGroupI(int whichCGI);
73 <    vector<int> getAtomsInGroupJ(int whichCGJ);
72 >    // group bookkeeping
73 >    void getGroupCutoffs(int &cg1, int &cg2, RealType &rcut, RealType &rcutsq, RealType &rlistsq);
74 >    Vector3d& getGroupVelocityColumn(int cg2);
75  
76 <    AtomType* getAtomTypeI(int whichAtomI);
77 <    AtomType* getAtomTypeJ(int whichAtomJ);  
76 >    // Group->atom bookkeeping
77 >    vector<int>& getAtomsInGroupRow(int cg1);
78 >    vector<int>& getAtomsInGroupColumn(int cg2);
79 >    Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
80 >    Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
81 >    RealType& getMassFactorRow(int atom1);
82 >    RealType& getMassFactorColumn(int atom2);
83  
84 +    // spatial data
85 +    Vector3d getIntergroupVector(int cg1, int cg2);
86 +    Vector3d getInteratomicVector(int atom1, int atom2);
87 +      
88 +    // atom bookkeeping
89 +    int& getNAtomsInRow();
90 +    int getTopologicalDistance(int atom1, int atom2);
91 +    vector<int>& getExcludesForAtom(int atom1);
92 +    bool skipAtomPair(int atom1, int atom2, int cg1, int cg2);
93 +    bool excludeAtomPair(int atom1, int atom2);
94 +    void addForceToAtomRow(int atom1, Vector3d fg);
95 +    void addForceToAtomColumn(int atom2, Vector3d fg);
96 +    Vector3d& getAtomVelocityColumn(int atom2);
97 +
98 +    // filling interaction blocks with pointers
99 +    void fillInteractionData(InteractionData &idat, int atom1, int atom2);
100 +    void unpackInteractionData(InteractionData &idat, int atom1, int atom2);
101 +
102    private:
103 <    SnapshotManager* sman_;    
103 >    void createGtypeCutoffMap();
104 >
105 >    int nLocal_;
106 >    int nGroups_;
107 >    vector<int> AtomLocalToGlobal;
108 >    vector<int> cgLocalToGlobal;
109 >    vector<RealType> groupCutoff;
110 >    vector<int> groupToGtype;
111 >
112   #ifdef IS_MPI    
113 <    Communicator<Row, int>* AtomCommIntI;
114 <    Communicator<Row, RealType>* AtomCommRealI;
115 <    Communicator<Row, Vector3d>* AtomCommVectorI;
116 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixI;
113 >    DataStorage atomRowData;
114 >    DataStorage atomColData;
115 >    DataStorage cgRowData;
116 >    DataStorage cgColData;
117  
118 <    Communicator<Column, int>* AtomCommIntJ;
119 <    Communicator<Column, RealType>* AtomCommRealJ;
120 <    Communicator<Column, Vector3d>* AtomCommVectorJ;
121 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ;
118 >    int nAtomsInRow_;
119 >    int nAtomsInCol_;
120 >    int nGroupsInRow_;
121 >    int nGroupsInCol_;
122  
123 <    Communicator<Row, int>* cgCommIntI;
124 <    Communicator<Row, Vector3d>* cgCommVectorI;
88 <    Communicator<Column, int>* cgCommIntJ;
89 <    Communicator<Column, Vector3d>* cgCommVectorJ;
123 >    Communicator<Row> rowComm;
124 >    Communicator<Column> colComm;
125  
126 <    vector<vector<RealType> > pot_row;
127 <    vector<vector<RealType> > pot_col;
128 <    vector<int> identRow;
129 <    vector<int> identCol;
126 >    Plan<int>* AtomPlanIntRow;
127 >    Plan<RealType>* AtomPlanRealRow;
128 >    Plan<Vector3d>* AtomPlanVectorRow;
129 >    Plan<Mat3x3d>*  AtomPlanMatrixRow;
130 >    Plan<potVec>* AtomPlanPotRow;
131  
132 <    vector<int> AtomLocalToGlobal;
132 >    Plan<int>* AtomPlanIntColumn;
133 >    Plan<RealType>* AtomPlanRealColumn;
134 >    Plan<Vector3d>* AtomPlanVectorColumn;
135 >    Plan<Mat3x3d>*  AtomPlanMatrixColumn;
136 >    Plan<potVec>* AtomPlanPotColumn;
137 >
138 >    Plan<int>* cgPlanIntRow;
139 >    Plan<Vector3d>* cgPlanVectorRow;
140 >    Plan<int>* cgPlanIntColumn;
141 >    Plan<Vector3d>* cgPlanVectorColumn;
142 >
143 >    // work arrays for assembling potential energy
144 >    vector<potVec> pot_row;
145 >    vector<potVec> pot_col;
146 >
147 >    vector<potVec> expot_row;
148 >    vector<potVec> expot_col;
149 >
150 >    vector<int> identsRow;
151 >    vector<int> identsCol;
152 >
153 >    vector<int> regionsRow;
154 >    vector<int> regionsCol;
155 >
156 >    vector<AtomType*> atypesRow;
157 >    vector<AtomType*> atypesCol;
158 >
159      vector<int> AtomRowToGlobal;
160      vector<int> AtomColToGlobal;
161 <    vector<int> cgLocalToGlobal;
161 >
162 > public:
163      vector<int> cgRowToGlobal;
164      vector<int> cgColToGlobal;
165 +
166 + private:
167 +    vector<RealType> groupCutoffRow;
168 +    vector<RealType> groupCutoffCol;
169 +    vector<int> groupColToGtype;
170 +    vector<int> groupRowToGtype;
171 +
172 +    vector<vector<int> > cellListRow_;
173 +    vector<vector<int> > cellListCol_;
174 +
175 +    vector<vector<int> > groupListRow_;
176 +    vector<vector<int> > groupListCol_;
177 +
178 +    vector<RealType> massFactorsRow;
179 +    vector<RealType> massFactorsCol;
180 +
181 +    vector<int> regionRow;
182 +    vector<int> regionCol;
183   #endif
184 <    vector<RealType> pot_local;
184 >
185    };
186  
187   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines