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.
branches/development/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1575 by gezelter, Fri Jun 3 21:39:49 2011 UTC

# 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) : ForceDecomposition(info) {};
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 >    pair<int, int> getGroupTypes(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 +    vector<int> getSkipsForRowAtom(int atom1);
88 +    int getTopoDistance(int atom1, int atom2);
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 >    int nLocal_;
100 >    int nGroups_;
101 >    vector<int> identsLocal;
102 >    vector<int> AtomLocalToGlobal;
103 >    vector<int> cgLocalToGlobal;
104 >    vector<RealType> massFactorsLocal;
105 >    vector<vector<int> > skipsForLocalAtom;
106 >    vector<vector<int> > toposForLocalAtom;
107 >    vector<vector<int> > topoDistLocal;
108 >
109   #ifdef IS_MPI    
110 <    Communicator<Row, int>* AtomCommIntI;
111 <    Communicator<Row, RealType>* AtomCommRealI;
112 <    Communicator<Row, Vector3d>* AtomCommVectorI;
113 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixI;
110 >    DataStorage atomRowData;
111 >    DataStorage atomColData;
112 >    DataStorage cgRowData;
113 >    DataStorage cgColData;
114  
115 <    Communicator<Column, int>* AtomCommIntJ;
116 <    Communicator<Column, RealType>* AtomCommRealJ;
117 <    Communicator<Column, Vector3d>* AtomCommVectorJ;
118 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ;
115 >    int nAtomsInRow_;
116 >    int nAtomsInCol_;
117 >    int nGroupsInRow_;
118 >    int nGroupsInCol_;
119  
120 <    Communicator<Row, int>* cgCommIntI;
121 <    Communicator<Row, Vector3d>* cgCommVectorI;
122 <    Communicator<Column, int>* cgCommIntJ;
123 <    Communicator<Column, Vector3d>* cgCommVectorJ;
120 >    Communicator<Row, int>* AtomCommIntRow;
121 >    Communicator<Row, RealType>* AtomCommRealRow;
122 >    Communicator<Row, Vector3d>* AtomCommVectorRow;
123 >    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
124 >    Communicator<Row, potVec>* AtomCommPotRow;
125  
126 <    vector<vector<RealType> > pot_row;
127 <    vector<vector<RealType> > pot_col;
128 <    vector<int> identRow;
129 <    vector<int> identCol;
126 >    Communicator<Column, int>* AtomCommIntColumn;
127 >    Communicator<Column, RealType>* AtomCommRealColumn;
128 >    Communicator<Column, Vector3d>* AtomCommVectorColumn;
129 >    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
130 >    Communicator<Column, potVec>* AtomCommPotColumn;
131  
132 <    vector<int> AtomLocalToGlobal;
132 >    Communicator<Row, int>* cgCommIntRow;
133 >    Communicator<Row, Vector3d>* cgCommVectorRow;
134 >    Communicator<Column, int>* cgCommIntColumn;
135 >    Communicator<Column, Vector3d>* cgCommVectorColumn;
136 >
137 >    // work arrays for assembling potential energy
138 >    vector<potVec> pot_row;
139 >    vector<potVec> pot_col;
140 >    potVec pot_local;
141 >
142 >    vector<int> identsRow;
143 >    vector<int> identsCol;
144 >
145 >    vector<AtomType*> atypesRow;
146 >    vector<AtomType*> atypesCol;
147 >
148      vector<int> AtomRowToGlobal;
149      vector<int> AtomColToGlobal;
150 <    vector<int> cgLocalToGlobal;
150 >
151      vector<int> cgRowToGlobal;
152      vector<int> cgColToGlobal;
153 +
154 +    vector<vector<int> > cellListRow_;
155 +    vector<vector<int> > cellListCol_;
156 +
157 +    vector<vector<int> > groupListRow_;
158 +    vector<vector<int> > groupListCol_;
159 +
160 +    vector<RealType> massFactorsRow;
161 +    vector<RealType> massFactorsCol;
162 +
163 +    vector<vector<int> > skipsForRowAtom;
164 +    vector<vector<int> > toposForRowAtom;
165 +    vector<vector<int> > topoDistRow;
166   #endif
167 <    vector<RealType> pot_local;
167 >
168    };
169  
170   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines