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 1571 by gezelter, Fri May 27 16:45:44 2011 UTC vs.
Revision 1587 by gezelter, Fri Jul 8 20:25:32 2011 UTC

# Line 55 | Line 55 | namespace OpenMD {
55    
56    class ForceMatrixDecomposition : public ForceDecomposition {
57    public:
58 <    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {};
58 >    ForceMatrixDecomposition(SimInfo* info, InteractionManager* iMan) : ForceDecomposition(info, iMan) {};
59  
60      void distributeInitialData();
61 +    void zeroWorkArrays();
62      void distributeData();
63      void collectIntermediateData();
64      void distributeIntermediateData();
# Line 67 | Line 68 | namespace OpenMD {
68      vector<pair<int, int> >  buildNeighborList();
69  
70      // group bookkeeping
71 <    pair<int, int> getGroupTypes(int cg1, int cg2);
71 >    groupCutoffs getGroupCutoffs(int cg1, int cg2);
72  
73      // Group->atom bookkeeping
74      vector<int> getAtomsInGroupRow(int cg1);
# Line 83 | Line 84 | namespace OpenMD {
84        
85      // atom bookkeeping
86      int getNAtomsInRow();
87 <    vector<int> getSkipsForRowAtom(int atom1);
88 <    int getTopoDistance(int atom1, int atom2);
87 >    int getTopologicalDistance(int atom1, int atom2);
88 >    vector<int> getExcludesForAtom(int atom1);
89      bool skipAtomPair(int atom1, int atom2);
90 +    bool excludeAtomPair(int atom1, int atom2);
91      void addForceToAtomRow(int atom1, Vector3d fg);
92      void addForceToAtomColumn(int atom2, Vector3d fg);
93  
94      // filling interaction blocks with pointers
95 <    InteractionData fillInteractionData(int atom1, int atom2);
96 <    InteractionData fillSkipData(int atom1, int atom2);
95 >    void fillInteractionData(InteractionData &idat, int atom1, int atom2);
96 >    void unpackInteractionData(InteractionData &idat, int atom1, int atom2);
97  
98    private:
99 +    void createGtypeCutoffMap();
100 +
101      int nLocal_;
102      int nGroups_;
99 –    vector<int> identsLocal;
103      vector<int> AtomLocalToGlobal;
104      vector<int> cgLocalToGlobal;
105 <    vector<RealType> pot_local;
106 <    vector<RealType> massFactorsLocal;
104 <    vector<vector<int> > skipsForLocalAtom;
105 <    vector<vector<int> > toposForLocalAtom;
106 <    vector<vector<int> > topoDistLocal;
105 >    vector<RealType> groupCutoff;
106 >    vector<int> groupToGtype;
107  
108   #ifdef IS_MPI    
109      DataStorage atomRowData;
# Line 120 | Line 120 | namespace OpenMD {
120      Communicator<Row, RealType>* AtomCommRealRow;
121      Communicator<Row, Vector3d>* AtomCommVectorRow;
122      Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
123 +    Communicator<Row, potVec>* AtomCommPotRow;
124  
125      Communicator<Column, int>* AtomCommIntColumn;
126      Communicator<Column, RealType>* AtomCommRealColumn;
127      Communicator<Column, Vector3d>* AtomCommVectorColumn;
128 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
128 >    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
129 >    Communicator<Column, potVec>* AtomCommPotColumn;
130  
131      Communicator<Row, int>* cgCommIntRow;
132      Communicator<Row, Vector3d>* cgCommVectorRow;
133      Communicator<Column, int>* cgCommIntColumn;
134      Communicator<Column, Vector3d>* cgCommVectorColumn;
135  
136 <    vector<vector<RealType> > pot_row;
137 <    vector<vector<RealType> > pot_col;
136 >    // work arrays for assembling potential energy
137 >    vector<potVec> pot_row;
138 >    vector<potVec> pot_col;
139  
140      vector<int> identsRow;
141      vector<int> identsCol;
# Line 146 | Line 149 | namespace OpenMD {
149      vector<int> cgRowToGlobal;
150      vector<int> cgColToGlobal;
151  
152 +    vector<RealType> groupCutoffRow;
153 +    vector<RealType> groupCutoffCol;
154 +    vector<int> groupColToGtype;
155 +    vector<int> groupRowToGtype;
156 +
157      vector<vector<int> > cellListRow_;
158      vector<vector<int> > cellListCol_;
159  
# Line 154 | Line 162 | namespace OpenMD {
162  
163      vector<RealType> massFactorsRow;
164      vector<RealType> massFactorsCol;
157 –
158 –    vector<vector<int> > skipsForRowAtom;
159 –    vector<vector<int> > toposForRowAtom;
160 –    vector<vector<int> > topoDistRow;
165   #endif
166  
167    };

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines