ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/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/devel_omp/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1595 by chuckv, Tue Jul 19 18:50: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"
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, InteractionManager* 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 >    // neighbor list routines based on Rapaport
70 >    vector<vector<int> > buildLayerBasedNeighborList();
71  
72 <    vector<int> getAtomsInGroupI(int whichCGI);
73 <    vector<int> getAtomsInGroupJ(int whichCGJ);
72 >    // group bookkeeping
73 >    groupCutoffs getGroupCutoffs(int cg1, int cg2);
74  
75 <    AtomType* getAtomTypeI(int whichAtomI);
76 <    AtomType* getAtomTypeJ(int whichAtomJ);  
75 >    // Group->atom bookkeeping
76 >    vector<int> getAtomsInGroupRow(int cg1);
77 >    vector<int> getAtomsInGroupColumn(int cg2);
78 >    Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
79 >    Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
80 >    RealType getMassFactorRow(int atom1);
81 >    RealType getMassFactorColumn(int atom2);
82  
83 < #ifdef IS_MPI
84 <    
85 <    Communicator<Row, RealType>* AtomCommRealI;
86 <    Communicator<Row, Vector3d>* AtomCommVectorI;
87 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixI;
83 >    // spatial data
84 >    Vector3d getIntergroupVector(int cg1, int cg2);
85 >    Vector3d getInteratomicVector(int atom1, int atom2);
86 >      
87 >    // atom bookkeeping
88 >    int getNAtomsInRow();
89 >    int getTopologicalDistance(int atom1, int atom2);
90 >    vector<int> getExcludesForAtom(int atom1);
91 >    bool skipAtomPair(int atom1, int atom2);
92 >    bool excludeAtomPair(int atom1, int atom2);
93 >    void addForceToAtomRow(int atom1, Vector3d fg);
94 >    void addForceToAtomColumn(int atom2, Vector3d fg);
95  
96 <    Communicator<Column, RealType>* AtomCommRealJ;
97 <    Communicator<Column, Vector3d>* AtomCommVectorJ;
98 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ;
96 >    // filling interaction blocks with pointers
97 >    void fillInteractionData(InteractionData &idat, int atom1, int atom2);
98 >    void unpackInteractionData(InteractionData &idat, int atom1, int atom2);
99  
100 <    Communicator<Row, Vector3d>* cgCommVectorI;
101 <    Communicator<Column, Vector3d>* cgCommVectorJ;
102 <    
100 >  private:
101 >    void createGtypeCutoffMap();
102 >
103 >    int nLocal_;
104 >    int nGroups_;
105 >    vector<int> AtomLocalToGlobal;
106 >    vector<int> cgLocalToGlobal;
107 >    vector<RealType> groupCutoff;
108 >    vector<int> groupToGtype;
109 >
110 > #ifdef IS_MPI    
111 >    DataStorage atomRowData;
112 >    DataStorage atomColData;
113 >    DataStorage cgRowData;
114 >    DataStorage cgColData;
115 >
116 >    int nAtomsInRow_;
117 >    int nAtomsInCol_;
118 >    int nGroupsInRow_;
119 >    int nGroupsInCol_;
120 >
121 >    Communicator<Row> rowComm;
122 >    Communicator<Column> colComm;
123 >
124 >    Plan<int>* AtomPlanIntRow;
125 >    Plan<RealType>* AtomPlanRealRow;
126 >    Plan<Vector3d>* AtomPlanVectorRow;
127 >    Plan<Mat3x3d>*  AtomPlanMatrixRow;
128 >    Plan<potVec>* AtomPlanPotRow;
129 >
130 >    Plan<int>* AtomPlanIntColumn;
131 >    Plan<RealType>* AtomPlanRealColumn;
132 >    Plan<Vector3d>* AtomPlanVectorColumn;
133 >    Plan<Mat3x3d>*  AtomPlanMatrixColumn;
134 >    Plan<potVec>* AtomPlanPotColumn;
135 >
136 >    Plan<int>* cgPlanIntRow;
137 >    Plan<Vector3d>* cgPlanVectorRow;
138 >    Plan<int>* cgPlanIntColumn;
139 >    Plan<Vector3d>* cgPlanVectorColumn;
140 >
141 >    // work arrays for assembling potential energy
142 >    vector<potVec> pot_row;
143 >    vector<potVec> pot_col;
144 >
145 >    vector<int> identsRow;
146 >    vector<int> identsCol;
147 >
148 >    vector<AtomType*> atypesRow;
149 >    vector<AtomType*> atypesCol;
150 >
151 >    vector<int> AtomRowToGlobal;
152 >    vector<int> AtomColToGlobal;
153 >
154 >    vector<int> cgRowToGlobal;
155 >    vector<int> cgColToGlobal;
156 >
157 >    vector<RealType> groupCutoffRow;
158 >    vector<RealType> groupCutoffCol;
159 >    vector<int> groupColToGtype;
160 >    vector<int> groupRowToGtype;
161 >
162 >    vector<vector<int> > cellListRow_;
163 >    vector<vector<int> > cellListCol_;
164 >
165 >    vector<vector<int> > groupListRow_;
166 >    vector<vector<int> > groupListCol_;
167 >
168 >    vector<RealType> massFactorsRow;
169 >    vector<RealType> massFactorsCol;
170   #endif
171 +
172    };
173  
174   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines