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 1540 by gezelter, Mon Jan 17 21:34:36 2011 UTC vs.
branches/development/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1571 by gezelter, Fri May 27 16:45:44 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"
46 < #include "Parallel/Communicator.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"
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(Snapshot* sman);
58 >    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {};
59 >
60      void distributeInitialData();
61      void distributeData();
62      void collectIntermediateData();
63      void distributeIntermediateData();
64      void collectData();
65  
66 <    unsigned int getNcutoffGroupsI();
67 <    unsigned int getNcutoffGroupsJ();
66 >    // neighbor list routines
67 >    vector<pair<int, int> >  buildNeighborList();
68  
69 <    vector<int> getAtomsInGroupI(int whichCGI);
70 <    vector<int> getAtomsInGroupJ(int whichCGJ);
69 >    // group bookkeeping
70 >    pair<int, int> getGroupTypes(int cg1, int cg2);
71  
72 <    AtomType* getAtomTypeI(int whichAtomI);
73 <    AtomType* getAtomTypeJ(int whichAtomJ);  
72 >    // Group->atom bookkeeping
73 >    vector<int> getAtomsInGroupRow(int cg1);
74 >    vector<int> getAtomsInGroupColumn(int cg2);
75 >    Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
76 >    Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
77 >    RealType getMassFactorRow(int atom1);
78 >    RealType getMassFactorColumn(int atom2);
79  
80 < #ifdef IS_MPI
81 <    
82 <    Communicator<Row, RealType>* AtomCommRealI;
83 <    Communicator<Row, Vector3d>* AtomCommVectorI;
84 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixI;
80 >    // spatial data
81 >    Vector3d getIntergroupVector(int cg1, int cg2);
82 >    Vector3d getInteratomicVector(int atom1, int atom2);
83 >      
84 >    // atom bookkeeping
85 >    int getNAtomsInRow();
86 >    vector<int> getSkipsForRowAtom(int atom1);
87 >    int getTopoDistance(int atom1, int atom2);
88 >    bool skipAtomPair(int atom1, int atom2);
89 >    void addForceToAtomRow(int atom1, Vector3d fg);
90 >    void addForceToAtomColumn(int atom2, Vector3d fg);
91  
92 <    Communicator<Column, RealType>* AtomCommRealJ;
93 <    Communicator<Column, Vector3d>* AtomCommVectorJ;
94 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ;
92 >    // filling interaction blocks with pointers
93 >    InteractionData fillInteractionData(int atom1, int atom2);
94 >    InteractionData fillSkipData(int atom1, int atom2);
95  
96 <    Communicator<Row, Vector3d>* cgCommVectorI;
97 <    Communicator<Column, Vector3d>* cgCommVectorJ;
98 <    
96 >  private:
97 >    int nLocal_;
98 >    int nGroups_;
99 >    vector<int> identsLocal;
100 >    vector<int> AtomLocalToGlobal;
101 >    vector<int> cgLocalToGlobal;
102 >    vector<RealType> pot_local;
103 >    vector<RealType> massFactorsLocal;
104 >    vector<vector<int> > skipsForLocalAtom;
105 >    vector<vector<int> > toposForLocalAtom;
106 >    vector<vector<int> > topoDistLocal;
107 >
108 > #ifdef IS_MPI    
109 >    DataStorage atomRowData;
110 >    DataStorage atomColData;
111 >    DataStorage cgRowData;
112 >    DataStorage cgColData;
113 >
114 >    int nAtomsInRow_;
115 >    int nAtomsInCol_;
116 >    int nGroupsInRow_;
117 >    int nGroupsInCol_;
118 >
119 >    Communicator<Row, int>* AtomCommIntRow;
120 >    Communicator<Row, RealType>* AtomCommRealRow;
121 >    Communicator<Row, Vector3d>* AtomCommVectorRow;
122 >    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
123 >
124 >    Communicator<Column, int>* AtomCommIntColumn;
125 >    Communicator<Column, RealType>* AtomCommRealColumn;
126 >    Communicator<Column, Vector3d>* AtomCommVectorColumn;
127 >    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
128 >
129 >    Communicator<Row, int>* cgCommIntRow;
130 >    Communicator<Row, Vector3d>* cgCommVectorRow;
131 >    Communicator<Column, int>* cgCommIntColumn;
132 >    Communicator<Column, Vector3d>* cgCommVectorColumn;
133 >
134 >    vector<vector<RealType> > pot_row;
135 >    vector<vector<RealType> > pot_col;
136 >
137 >    vector<int> identsRow;
138 >    vector<int> identsCol;
139 >
140 >    vector<AtomType*> atypesRow;
141 >    vector<AtomType*> atypesCol;
142 >
143 >    vector<int> AtomRowToGlobal;
144 >    vector<int> AtomColToGlobal;
145 >
146 >    vector<int> cgRowToGlobal;
147 >    vector<int> cgColToGlobal;
148 >
149 >    vector<vector<int> > cellListRow_;
150 >    vector<vector<int> > cellListCol_;
151 >
152 >    vector<vector<int> > groupListRow_;
153 >    vector<vector<int> > groupListCol_;
154 >
155 >    vector<RealType> massFactorsRow;
156 >    vector<RealType> massFactorsCol;
157 >
158 >    vector<vector<int> > skipsForRowAtom;
159 >    vector<vector<int> > toposForRowAtom;
160 >    vector<vector<int> > topoDistRow;
161   #endif
162 +
163    };
164  
165   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines