# | 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_FORCEMATRIXDECOMPOSITION_HPP | |
# | Line 55 | Line 56 | namespace OpenMD { | |
56 | ||
57 | class ForceMatrixDecomposition : public ForceDecomposition { | |
58 | public: | |
59 | < | ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(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 collectData(); | |
67 | ||
68 | // neighbor list routines | |
66 | – | bool checkNeighborList(); |
69 | vector<pair<int, int> > buildNeighborList(); | |
70 | ||
71 | // group bookkeeping | |
72 | < | pair<int, int> getGroupTypes(int cg1, int cg2); |
72 | > | groupCutoffs getGroupCutoffs(int cg1, int cg2); |
73 | ||
74 | // Group->atom bookkeeping | |
75 | vector<int> getAtomsInGroupRow(int cg1); | |
76 | vector<int> getAtomsInGroupColumn(int cg2); | |
77 | Vector3d getAtomToGroupVectorRow(int atom1, int cg1); | |
78 | Vector3d getAtomToGroupVectorColumn(int atom2, int cg2); | |
79 | < | RealType getMfactRow(int atom1); |
80 | < | RealType getMfactColumn(int atom2); |
79 | > | RealType getMassFactorRow(int atom1); |
80 | > | RealType getMassFactorColumn(int atom2); |
81 | ||
82 | // spatial data | |
83 | Vector3d getIntergroupVector(int cg1, int cg2); | |
84 | Vector3d getInteratomicVector(int atom1, int atom2); | |
85 | ||
86 | // atom bookkeeping | |
87 | < | vector<int> getAtomList(); |
88 | < | vector<int> getSkipsForAtom(int atom1); |
87 | > | int getNAtomsInRow(); |
88 | > | int getTopologicalDistance(int atom1, int atom2); |
89 | > | vector<int> getExcludesForAtom(int atom1); |
90 | bool skipAtomPair(int atom1, int atom2); | |
91 | + | bool excludeAtomPair(int atom1, int atom2); |
92 | void addForceToAtomRow(int atom1, Vector3d fg); | |
93 | void addForceToAtomColumn(int atom2, Vector3d fg); | |
94 | ||
95 | // filling interaction blocks with pointers | |
96 | < | InteractionData fillInteractionData(int atom1, int atom2); |
97 | < | InteractionData fillSkipData(int atom1, int atom2); |
94 | < | SelfData fillSelfData(int atom1); |
96 | > | void fillInteractionData(InteractionData &idat, int atom1, int atom2); |
97 | > | void unpackInteractionData(InteractionData &idat, int atom1, int atom2); |
98 | ||
99 | private: | |
100 | < | SnapshotManager* sman_; |
98 | < | Snapshot* snap_; |
99 | < | int storageLayout_; |
100 | < | vector<Vector3i> Cells; |
100 | > | void createGtypeCutoffMap(); |
101 | ||
102 | int nLocal_; | |
103 | int nGroups_; | |
104 | + | vector<int> AtomLocalToGlobal; |
105 | + | vector<int> cgLocalToGlobal; |
106 | + | vector<RealType> groupCutoff; |
107 | + | vector<int> groupToGtype; |
108 | ||
109 | #ifdef IS_MPI | |
110 | DataStorage atomRowData; | |
# | Line 113 | Line 117 | namespace OpenMD { | |
117 | int nGroupsInRow_; | |
118 | int nGroupsInCol_; | |
119 | ||
120 | < | Communicator<Row, int>* AtomCommIntRow; |
121 | < | Communicator<Row, RealType>* AtomCommRealRow; |
118 | < | Communicator<Row, Vector3d>* AtomCommVectorRow; |
119 | < | Communicator<Row, Mat3x3d>* AtomCommMatrixRow; |
120 | > | Communicator<Row> rowComm; |
121 | > | Communicator<Column> colComm; |
122 | ||
123 | < | Communicator<Column, int>* AtomCommIntColumn; |
124 | < | Communicator<Column, RealType>* AtomCommRealColumn; |
125 | < | Communicator<Column, Vector3d>* AtomCommVectorColumn; |
126 | < | Communicator<Column, Mat3x3d>* AtomCommMatrixColumn; |
123 | > | Plan<int>* AtomPlanIntRow; |
124 | > | Plan<RealType>* AtomPlanRealRow; |
125 | > | Plan<Vector3d>* AtomPlanVectorRow; |
126 | > | Plan<Mat3x3d>* AtomPlanMatrixRow; |
127 | > | Plan<potVec>* AtomPlanPotRow; |
128 | ||
129 | < | Communicator<Row, int>* cgCommIntRow; |
130 | < | Communicator<Row, Vector3d>* cgCommVectorRow; |
131 | < | Communicator<Column, int>* cgCommIntColumn; |
132 | < | Communicator<Column, Vector3d>* cgCommVectorColumn; |
129 | > | Plan<int>* AtomPlanIntColumn; |
130 | > | Plan<RealType>* AtomPlanRealColumn; |
131 | > | Plan<Vector3d>* AtomPlanVectorColumn; |
132 | > | Plan<Mat3x3d>* AtomPlanMatrixColumn; |
133 | > | Plan<potVec>* AtomPlanPotColumn; |
134 | ||
135 | < | vector<vector<RealType> > pot_row; |
136 | < | vector<vector<RealType> > pot_col; |
135 | > | Plan<int>* cgPlanIntRow; |
136 | > | Plan<Vector3d>* cgPlanVectorRow; |
137 | > | Plan<int>* cgPlanIntColumn; |
138 | > | Plan<Vector3d>* cgPlanVectorColumn; |
139 | > | |
140 | > | // work arrays for assembling potential energy |
141 | > | vector<potVec> pot_row; |
142 | > | vector<potVec> pot_col; |
143 | > | |
144 | vector<int> identsRow; | |
145 | vector<int> identsCol; | |
146 | ||
147 | < | vector<int> AtomLocalToGlobal; |
147 | > | vector<AtomType*> atypesRow; |
148 | > | vector<AtomType*> atypesCol; |
149 | > | |
150 | vector<int> AtomRowToGlobal; | |
151 | vector<int> AtomColToGlobal; | |
152 | < | vector<int> cgLocalToGlobal; |
152 | > | |
153 | > | public: |
154 | vector<int> cgRowToGlobal; | |
155 | vector<int> cgColToGlobal; | |
156 | ||
157 | < | vector<vector<int> > CellListRow; |
158 | < | vector<vector<int> > CellListCol; |
159 | < | #else |
160 | < | vector<vector<int> > CellList; |
157 | > | private: |
158 | > | vector<RealType> groupCutoffRow; |
159 | > | vector<RealType> groupCutoffCol; |
160 | > | vector<int> groupColToGtype; |
161 | > | vector<int> groupRowToGtype; |
162 | > | |
163 | > | vector<vector<int> > cellListRow_; |
164 | > | vector<vector<int> > cellListCol_; |
165 | > | |
166 | > | vector<vector<int> > groupListRow_; |
167 | > | vector<vector<int> > groupListCol_; |
168 | > | |
169 | > | vector<RealType> massFactorsRow; |
170 | > | vector<RealType> massFactorsCol; |
171 | #endif | |
148 | – | vector<RealType> pot_local; |
172 | ||
173 | }; | |
174 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |