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 1538 by chuckv, Tue Jan 11 18:58:12 2011 UTC vs.
branches/devel_omp/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1608 by mciznick, Tue Aug 9 01:58:56 2011 UTC

# Line 1 | Line 1
1 < /**
2 < * @file ForceDecomposition.cpp
3 < * @author Charles Vardeman <cvardema.at.nd.edu>
4 < * @date 08/18/2010
5 < * @time 11:56am
6 < * @version 1.0
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
8 * @section LICENSE
9 * Copyright (c) 2010 The University of Notre Dame. All Rights Reserved.
10 *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
6   * redistribute this software in source and binary code form, provided
# Line 45 | Line 38
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39   * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41 +
42 + #ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
43 + #define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
44  
45 + #include "parallel/ForceDecomposition.hpp"
46 + #include "math/SquareMatrix3.hpp"
47 + #include "brains/Snapshot.hpp"
48  
49 < /*  -*- c++ -*-  */
50 < #ifndef FORCEDECOMPOSITION_PARALLEL_HPP
51 < #define FORCEDECOMPOSITION_PARALLEL_HPP
49 > #ifdef IS_MPI
50 > #include "parallel/Communicator.hpp"
51 > #endif
52  
53 + using namespace std;
54 + namespace OpenMD {
55 +  
56 +  class ForceMatrixDecomposition : public ForceDecomposition {
57 +  public:
58 +    ForceMatrixDecomposition(SimInfo* info, InteractionManager* iMan);
59  
60 < namespace OpenMD{
60 >    void distributeInitialData();
61 >    void zeroWorkArrays();
62 >    void distributeData();
63 >    void collectIntermediateData();
64 >    void distributeIntermediateData();
65 >    void collectData();
66  
67 < class ForceDecomposition
68 < {
69 < public:
70 <  ForceDecomposition();
61 <  virtual ~ForceDecomposition();
62 <  void gather();
63 <  void scatter();
64 <  
65 < protected:
66 < private:
67 <  int myRank_;
68 <  static bool isColumn_;
69 <  static int myIndex_:
70 < };
67 >    // neighbor list routines
68 >    vector<pair<int, int> >  buildNeighborList();
69 >    // neighbor list routines based on Rapaport
70 >    vector<vector<CutoffGroup *> > buildLayerBasedNeighborList();
71  
72 +    // group bookkeeping
73 +    groupCutoffs getGroupCutoffs(int cg1, int cg2);
74  
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 < }
83 >    // spatial data
84 >    Vector3d getIntergroupVector(int cg1, int cg2);
85 >    Vector3d getIntergroupVector(CutoffGroup *cg1, CutoffGroup *cg2);
86 >    Vector3d getInteratomicVector(int atom1, int atom2);
87 >      
88 >    // atom bookkeeping
89 >    int getNAtomsInRow();
90 >    int getTopologicalDistance(int atom1, int atom2);
91 >    vector<int> getExcludesForAtom(int atom1);
92 >    bool skipAtomPair(int atom1, int atom2);
93 >    bool excludeAtomPair(int atom1, int atom2);
94 >    void addForceToAtomRow(int atom1, Vector3d fg);
95 >    void addForceToAtomColumn(int atom2, Vector3d fg);
96  
97 +    void addForceToAtomRowOMP(int atom1, Vector3d fg);
98 +    void addForceToAtomColumnOMP(int atom2, Vector3d fg);
99  
100 +    // filling interaction blocks with pointers
101 +    void fillInteractionData(InteractionData &idat, int atom1, int atom2);
102 +    void fillInteractionDataOMP(InteractionDataPrv &idat, int atom1, int atom2);
103 +    void unpackInteractionData(InteractionData &idat, int atom1, int atom2);
104  
105 +    void unpackInteractionDataOMP(InteractionDataPrv &idat, int atom1, int atom2);
106  
107 +    // memory reordering
108 +    void reorderGroupCutoffs(vector<int> &order);
109 +    void reorderPosition(vector<int> &order);
110 +    void reorderGroupList(vector<int> &order);
111 +    void reorderMemory(vector<vector<CutoffGroup *> > &H_c_l);
112  
113 +  private:
114 +    void createGtypeCutoffMap();
115  
116 +    int nLocal_;
117 +    int nGroups_;
118 +    vector<int> AtomLocalToGlobal;
119 +    vector<int> cgLocalToGlobal;
120 +    vector<RealType> groupCutoff;
121 +    vector<int> groupToGtype;
122  
123 +    /* XXX */
124 +    int neighborListReorderFreq;
125 +    int reorderFreqCounter;
126  
127 + #ifdef IS_MPI    
128 +    DataStorage atomRowData;
129 +    DataStorage atomColData;
130 +    DataStorage cgRowData;
131 +    DataStorage cgColData;
132 +
133 +    int nAtomsInRow_;
134 +    int nAtomsInCol_;
135 +    int nGroupsInRow_;
136 +    int nGroupsInCol_;
137 +
138 +    Communicator<Row> rowComm;
139 +    Communicator<Column> colComm;
140 +
141 +    Plan<int>* AtomPlanIntRow;
142 +    Plan<RealType>* AtomPlanRealRow;
143 +    Plan<Vector3d>* AtomPlanVectorRow;
144 +    Plan<Mat3x3d>*  AtomPlanMatrixRow;
145 +    Plan<potVec>* AtomPlanPotRow;
146 +
147 +    Plan<int>* AtomPlanIntColumn;
148 +    Plan<RealType>* AtomPlanRealColumn;
149 +    Plan<Vector3d>* AtomPlanVectorColumn;
150 +    Plan<Mat3x3d>*  AtomPlanMatrixColumn;
151 +    Plan<potVec>* AtomPlanPotColumn;
152 +
153 +    Plan<int>* cgPlanIntRow;
154 +    Plan<Vector3d>* cgPlanVectorRow;
155 +    Plan<int>* cgPlanIntColumn;
156 +    Plan<Vector3d>* cgPlanVectorColumn;
157 +
158 +    // work arrays for assembling potential energy
159 +    vector<potVec> pot_row;
160 +    vector<potVec> pot_col;
161 +
162 +    vector<int> identsRow;
163 +    vector<int> identsCol;
164 +
165 +    vector<AtomType*> atypesRow;
166 +    vector<AtomType*> atypesCol;
167 +
168 +    vector<int> AtomRowToGlobal;
169 +    vector<int> AtomColToGlobal;
170 +
171 +    vector<int> cgRowToGlobal;
172 +    vector<int> cgColToGlobal;
173 +
174 +    vector<RealType> groupCutoffRow;
175 +    vector<RealType> groupCutoffCol;
176 +    vector<int> groupColToGtype;
177 +    vector<int> groupRowToGtype;
178 +
179 +    vector<vector<int> > cellListRow_;
180 +    vector<vector<int> > cellListCol_;
181 +
182 +    vector<vector<int> > groupListRow_;
183 +    vector<vector<int> > groupListCol_;
184 +
185 +    vector<RealType> massFactorsRow;
186 +    vector<RealType> massFactorsCol;
187   #endif
188  
189 +  };
190  
191 + }
192 + #endif
193 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines