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/ForceMatrixDecomposition.hpp (file contents):
Revision 1569 by gezelter, Thu May 26 13:55:04 2011 UTC vs.
Revision 1575 by gezelter, Fri Jun 3 21:39:49 2011 UTC

# Line 58 | Line 58 | namespace OpenMD {
58      ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {};
59  
60      void distributeInitialData();
61 +    void zeroWorkArrays();
62      void distributeData();
63      void collectIntermediateData();
64      void distributeIntermediateData();
# Line 82 | Line 83 | namespace OpenMD {
83      Vector3d getInteratomicVector(int atom1, int atom2);
84        
85      // atom bookkeeping
86 <    vector<int> getAtomList();
87 <    vector<int> getSkipsForAtom(int atom1);
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      int nLocal_;
100      int nGroups_;
101 +    vector<int> identsLocal;
102      vector<int> AtomLocalToGlobal;
103      vector<int> cgLocalToGlobal;
100    vector<RealType> pot_local;
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      DataStorage atomRowData;
# Line 115 | Line 121 | namespace OpenMD {
121      Communicator<Row, RealType>* AtomCommRealRow;
122      Communicator<Row, Vector3d>* AtomCommVectorRow;
123      Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
124 +    Communicator<Row, potVec>* AtomCommPotRow;
125  
126      Communicator<Column, int>* AtomCommIntColumn;
127      Communicator<Column, RealType>* AtomCommRealColumn;
128      Communicator<Column, Vector3d>* AtomCommVectorColumn;
129 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
129 >    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
130 >    Communicator<Column, potVec>* AtomCommPotColumn;
131  
132      Communicator<Row, int>* cgCommIntRow;
133      Communicator<Row, Vector3d>* cgCommVectorRow;
134      Communicator<Column, int>* cgCommIntColumn;
135      Communicator<Column, Vector3d>* cgCommVectorColumn;
136  
137 <    vector<vector<RealType> > pot_row;
138 <    vector<vector<RealType> > pot_col;
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  
# Line 147 | Line 160 | namespace OpenMD {
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  
168    };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines