# | Line 39 | Line 39 | |
---|---|---|
39 | * [4] Vardeman & Gezelter, in progress (2009). | |
40 | */ | |
41 | ||
42 | < | #ifndef PARALLEL_FORCEDECOMPOSITION_HPP |
43 | < | #define PARALLEL_FORCEDECOMPOSITION_HPP |
42 | > | #ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP |
43 | > | #define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP |
44 | ||
45 | < | #include "Parallel/Decomposition.hpp" |
45 | > | #include "parallel/ForceDecomposition.hpp" |
46 | #include "math/SquareMatrix3.hpp" | |
47 | + | #include "brains/Snapshot.hpp" |
48 | ||
49 | #ifdef IS_MPI | |
50 | < | #include "Parallel/Communicator.hpp" |
50 | > | #include "parallel/Communicator.hpp" |
51 | #endif | |
52 | ||
53 | using namespace std; | |
54 | namespace OpenMD { | |
55 | ||
56 | < | class ForceDecomposition : public Decomposition { |
56 | > | class ForceMatrixDecomposition : public ForceDecomposition { |
57 | public: | |
58 | < | ForceDecomposition(SimInfo* info) : Decomposition(info) {sman_ = info_->getSnapshotManager();} |
58 | > | ForceMatrixDecomposition(SimInfo* info, InteractionManager* iMan) : ForceDecomposition(info, iMan) {}; |
59 | > | |
60 | void distributeInitialData(); | |
61 | + | void zeroWorkArrays(); |
62 | void distributeData(); | |
63 | void collectIntermediateData(); | |
64 | void distributeIntermediateData(); | |
65 | void collectData(); | |
66 | ||
67 | < | unsigned int getNcutoffGroupsI(); |
68 | < | unsigned int getNcutoffGroupsJ(); |
67 | > | // neighbor list routines |
68 | > | vector<pair<int, int> > buildNeighborList(); |
69 | ||
70 | < | vector<int> getAtomsInGroupI(int whichCGI); |
71 | < | vector<int> getAtomsInGroupJ(int whichCGJ); |
70 | > | // group bookkeeping |
71 | > | groupCutoffs getGroupCutoffs(int cg1, int cg2); |
72 | ||
73 | < | AtomType* getAtomTypeI(int whichAtomI); |
74 | < | AtomType* getAtomTypeJ(int whichAtomJ); |
73 | > | // Group->atom bookkeeping |
74 | > | vector<int> getAtomsInGroupRow(int cg1); |
75 | > | vector<int> getAtomsInGroupColumn(int cg2); |
76 | > | Vector3d getAtomToGroupVectorRow(int atom1, int cg1); |
77 | > | Vector3d getAtomToGroupVectorColumn(int atom2, int cg2); |
78 | > | RealType getMassFactorRow(int atom1); |
79 | > | RealType getMassFactorColumn(int atom2); |
80 | ||
81 | + | // spatial data |
82 | + | Vector3d getIntergroupVector(int cg1, int cg2); |
83 | + | Vector3d getInteratomicVector(int atom1, int atom2); |
84 | + | |
85 | + | // atom bookkeeping |
86 | + | int getNAtomsInRow(); |
87 | + | int getTopologicalDistance(int atom1, int atom2); |
88 | + | vector<int> getSkipsForAtom(int atom1); |
89 | + | bool skipAtomPair(int atom1, int atom2); |
90 | + | void addForceToAtomRow(int atom1, Vector3d fg); |
91 | + | void addForceToAtomColumn(int atom2, Vector3d fg); |
92 | + | |
93 | + | // filling interaction blocks with pointers |
94 | + | InteractionData fillInteractionData(int atom1, int atom2); |
95 | + | void unpackInteractionData(InteractionData idat, int atom1, int atom2); |
96 | + | InteractionData fillSkipData(int atom1, int atom2); |
97 | + | |
98 | private: | |
99 | < | SnapshotManager* sman_; |
99 | > | void createGtypeCutoffMap(); |
100 | > | |
101 | > | int nLocal_; |
102 | > | int nGroups_; |
103 | > | vector<int> identsLocal; |
104 | > | vector<int> AtomLocalToGlobal; |
105 | > | vector<int> cgLocalToGlobal; |
106 | > | vector<RealType> massFactorsLocal; |
107 | > | vector<RealType> groupCutoff; |
108 | > | vector<int> groupToGtype; |
109 | > | |
110 | #ifdef IS_MPI | |
111 | < | Communicator<Row, int>* AtomCommIntI; |
112 | < | Communicator<Row, RealType>* AtomCommRealI; |
113 | < | Communicator<Row, Vector3d>* AtomCommVectorI; |
114 | < | Communicator<Row, Mat3x3d>* AtomCommMatrixI; |
111 | > | DataStorage atomRowData; |
112 | > | DataStorage atomColData; |
113 | > | DataStorage cgRowData; |
114 | > | DataStorage cgColData; |
115 | ||
116 | < | Communicator<Column, int>* AtomCommIntJ; |
117 | < | Communicator<Column, RealType>* AtomCommRealJ; |
118 | < | Communicator<Column, Vector3d>* AtomCommVectorJ; |
119 | < | Communicator<Column, Mat3x3d>* AtomCommMatrixJ; |
116 | > | int nAtomsInRow_; |
117 | > | int nAtomsInCol_; |
118 | > | int nGroupsInRow_; |
119 | > | int nGroupsInCol_; |
120 | ||
121 | < | Communicator<Row, int>* cgCommIntI; |
122 | < | Communicator<Row, Vector3d>* cgCommVectorI; |
123 | < | Communicator<Column, int>* cgCommIntJ; |
124 | < | Communicator<Column, Vector3d>* cgCommVectorJ; |
121 | > | Communicator<Row, int>* AtomCommIntRow; |
122 | > | Communicator<Row, RealType>* AtomCommRealRow; |
123 | > | Communicator<Row, Vector3d>* AtomCommVectorRow; |
124 | > | Communicator<Row, Mat3x3d>* AtomCommMatrixRow; |
125 | > | Communicator<Row, potVec>* AtomCommPotRow; |
126 | ||
127 | < | vector<vector<RealType> > pot_row; |
128 | < | vector<vector<RealType> > pot_col; |
129 | < | vector<int> identRow; |
130 | < | vector<int> identCol; |
127 | > | Communicator<Column, int>* AtomCommIntColumn; |
128 | > | Communicator<Column, RealType>* AtomCommRealColumn; |
129 | > | Communicator<Column, Vector3d>* AtomCommVectorColumn; |
130 | > | Communicator<Column, Mat3x3d>* AtomCommMatrixColumn; |
131 | > | Communicator<Column, potVec>* AtomCommPotColumn; |
132 | ||
133 | < | vector<int> AtomLocalToGlobal; |
133 | > | Communicator<Row, int>* cgCommIntRow; |
134 | > | Communicator<Row, Vector3d>* cgCommVectorRow; |
135 | > | Communicator<Column, int>* cgCommIntColumn; |
136 | > | Communicator<Column, Vector3d>* cgCommVectorColumn; |
137 | > | |
138 | > | // work arrays for assembling potential energy |
139 | > | vector<potVec> pot_row; |
140 | > | vector<potVec> pot_col; |
141 | > | potVec pot_local; |
142 | > | |
143 | > | vector<int> identsRow; |
144 | > | vector<int> identsCol; |
145 | > | |
146 | > | vector<AtomType*> atypesRow; |
147 | > | vector<AtomType*> atypesCol; |
148 | > | |
149 | vector<int> AtomRowToGlobal; | |
150 | vector<int> AtomColToGlobal; | |
151 | < | vector<int> cgLocalToGlobal; |
151 | > | |
152 | vector<int> cgRowToGlobal; | |
153 | vector<int> cgColToGlobal; | |
154 | + | |
155 | + | vector<RealType> groupCutoffRow; |
156 | + | vector<RealType> groupCutoffCol; |
157 | + | vector<int> groupColToGtype; |
158 | + | vector<int> groupRowToGtype; |
159 | + | |
160 | + | vector<vector<int> > cellListRow_; |
161 | + | vector<vector<int> > cellListCol_; |
162 | + | |
163 | + | vector<vector<int> > groupListRow_; |
164 | + | vector<vector<int> > groupListCol_; |
165 | + | |
166 | + | vector<RealType> massFactorsRow; |
167 | + | vector<RealType> massFactorsCol; |
168 | #endif | |
169 | < | vector<RealType> pot_local; |
169 | > | |
170 | }; | |
171 | ||
172 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |