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 1570 by gezelter, Thu May 26 21:56:04 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 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 +    // 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 +    // filling interaction blocks with pointers
93 +    InteractionData fillInteractionData(int atom1, int atom2);
94 +    InteractionData fillSkipData(int atom1, int atom2);
95 +
96    private:
97 <    SnapshotManager* sman_;    
97 >    int nLocal_;
98 >    int nGroups_;
99 >    vector<int> AtomLocalToGlobal;
100 >    vector<int> cgLocalToGlobal;
101 >    vector<RealType> pot_local;
102 >    vector<RealType> massFactorsLocal;
103 >    vector<vector<int> > skipsForLocalAtom;
104 >    vector<vector<int> > toposForLocalAtom;
105 >    vector<vector<int> > topoDistLocal;
106 >
107   #ifdef IS_MPI    
108 <    Communicator<Row, int>* AtomCommIntI;
109 <    Communicator<Row, RealType>* AtomCommRealI;
110 <    Communicator<Row, Vector3d>* AtomCommVectorI;
111 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixI;
108 >    DataStorage atomRowData;
109 >    DataStorage atomColData;
110 >    DataStorage cgRowData;
111 >    DataStorage cgColData;
112  
113 <    Communicator<Column, int>* AtomCommIntJ;
114 <    Communicator<Column, RealType>* AtomCommRealJ;
115 <    Communicator<Column, Vector3d>* AtomCommVectorJ;
116 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ;
113 >    int nAtomsInRow_;
114 >    int nAtomsInCol_;
115 >    int nGroupsInRow_;
116 >    int nGroupsInCol_;
117  
118 <    Communicator<Row, int>* cgCommIntI;
119 <    Communicator<Row, Vector3d>* cgCommVectorI;
120 <    Communicator<Column, int>* cgCommIntJ;
121 <    Communicator<Column, Vector3d>* cgCommVectorJ;
118 >    Communicator<Row, int>* AtomCommIntRow;
119 >    Communicator<Row, RealType>* AtomCommRealRow;
120 >    Communicator<Row, Vector3d>* AtomCommVectorRow;
121 >    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
122  
123 +    Communicator<Column, int>* AtomCommIntColumn;
124 +    Communicator<Column, RealType>* AtomCommRealColumn;
125 +    Communicator<Column, Vector3d>* AtomCommVectorColumn;
126 +    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
127 +
128 +    Communicator<Row, int>* cgCommIntRow;
129 +    Communicator<Row, Vector3d>* cgCommVectorRow;
130 +    Communicator<Column, int>* cgCommIntColumn;
131 +    Communicator<Column, Vector3d>* cgCommVectorColumn;
132 +
133      vector<vector<RealType> > pot_row;
134      vector<vector<RealType> > pot_col;
93    vector<int> identRow;
94    vector<int> identCol;
135  
136 <    vector<int> AtomLocalToGlobal;
136 >    vector<int> identsRow;
137 >    vector<int> identsCol;
138 >
139      vector<int> AtomRowToGlobal;
140      vector<int> AtomColToGlobal;
141 <    vector<int> cgLocalToGlobal;
141 >
142      vector<int> cgRowToGlobal;
143      vector<int> cgColToGlobal;
144 +
145 +    vector<vector<int> > cellListRow_;
146 +    vector<vector<int> > cellListCol_;
147 +
148 +    vector<vector<int> > groupListRow_;
149 +    vector<vector<int> > groupListCol_;
150 +
151 +    vector<RealType> massFactorsRow;
152 +    vector<RealType> massFactorsCol;
153 +
154 +    vector<vector<int> > skipsForRowAtom;
155 +    vector<vector<int> > toposForRowAtom;
156 +    vector<vector<int> > topoDistRow;
157 +
158 +
159   #endif
160 <    vector<RealType> pot_local;
160 >
161    };
162  
163   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines