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 1567 by gezelter, Tue May 24 21:24:45 2011 UTC vs.
Revision 1593 by gezelter, Fri Jul 15 21:35:14 2011 UTC

# Line 55 | Line 55 | namespace OpenMD {
55    
56    class ForceMatrixDecomposition : public ForceDecomposition {
57    public:
58 <    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {sman_ = info_->getSnapshotManager();}
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      // neighbor list routines
66    bool checkNeighborList();
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);
75      vector<int> getAtomsInGroupColumn(int cg2);
76      Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
77      Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
78 <    RealType getMfactRow(int atom1);
79 <    RealType getMfactColumn(int atom2);
78 >    RealType getMassFactorRow(int atom1);
79 >    RealType getMassFactorColumn(int atom2);
80  
81      // spatial data
82      Vector3d getIntergroupVector(int cg1, int cg2);
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 >    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);
94 <    SelfData fillSelfData(int atom1);
95 >    void fillInteractionData(InteractionData &idat, int atom1, int atom2);
96 >    void unpackInteractionData(InteractionData &idat, int atom1, int atom2);
97  
98    private:
99 <    SnapshotManager* sman_;    
98 <    Snapshot* snap_;
99 <    int storageLayout_;
100 <    vector<Vector3i> Cells;
99 >    void createGtypeCutoffMap();
100  
101      int nLocal_;
102      int nGroups_;
103 +    vector<int> AtomLocalToGlobal;
104 +    vector<int> cgLocalToGlobal;
105 +    vector<RealType> groupCutoff;
106 +    vector<int> groupToGtype;
107  
108   #ifdef IS_MPI    
109      DataStorage atomRowData;
# Line 113 | Line 116 | namespace OpenMD {
116      int nGroupsInRow_;
117      int nGroupsInCol_;
118  
119 <    Communicator<Row, int>* AtomCommIntRow;
120 <    Communicator<Row, RealType>* AtomCommRealRow;
118 <    Communicator<Row, Vector3d>* AtomCommVectorRow;
119 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
119 >    Communicator<Row> rowComm;
120 >    Communicator<Column> colComm;
121  
122 <    Communicator<Column, int>* AtomCommIntColumn;
123 <    Communicator<Column, RealType>* AtomCommRealColumn;
124 <    Communicator<Column, Vector3d>* AtomCommVectorColumn;
125 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
122 >    Plan<int>* AtomPlanIntRow;
123 >    Plan<RealType>* AtomPlanRealRow;
124 >    Plan<Vector3d>* AtomPlanVectorRow;
125 >    Plan<Mat3x3d>*  AtomPlanMatrixRow;
126 >    Plan<potVec>* AtomPlanPotRow;
127  
128 <    Communicator<Row, int>* cgCommIntRow;
129 <    Communicator<Row, Vector3d>* cgCommVectorRow;
130 <    Communicator<Column, int>* cgCommIntColumn;
131 <    Communicator<Column, Vector3d>* cgCommVectorColumn;
128 >    Plan<int>* AtomPlanIntColumn;
129 >    Plan<RealType>* AtomPlanRealColumn;
130 >    Plan<Vector3d>* AtomPlanVectorColumn;
131 >    Plan<Mat3x3d>*  AtomPlanMatrixColumn;
132 >    Plan<potVec>* AtomPlanPotColumn;
133  
134 <    vector<vector<RealType> > pot_row;
135 <    vector<vector<RealType> > pot_col;
134 >    Plan<int>* cgPlanIntRow;
135 >    Plan<Vector3d>* cgPlanVectorRow;
136 >    Plan<int>* cgPlanIntColumn;
137 >    Plan<Vector3d>* cgPlanVectorColumn;
138 >
139 >    // work arrays for assembling potential energy
140 >    vector<potVec> pot_row;
141 >    vector<potVec> pot_col;
142 >
143      vector<int> identsRow;
144      vector<int> identsCol;
145  
146 <    vector<int> AtomLocalToGlobal;
146 >    vector<AtomType*> atypesRow;
147 >    vector<AtomType*> atypesCol;
148 >
149      vector<int> AtomRowToGlobal;
150      vector<int> AtomColToGlobal;
151 <    vector<int> cgLocalToGlobal;
151 >
152      vector<int> cgRowToGlobal;
153      vector<int> cgColToGlobal;
154  
155 <    vector<vector<int> > CellListRow;
156 <    vector<vector<int> > CellListCol;
157 < #else
158 <    vector<vector<int> > CellList;
155 >    vector<RealType> groupCutoffRow;
156 >    vector<RealType> groupCutoffCol;
157 >    vector<int> groupColToGtype;
158 >    vector<int> groupRowToGtype;
159 >
160 >    vector<vector<int> > cellListRow_;
161 >    vector<vector<int> > cellListCol_;
162 >
163 >    vector<vector<int> > groupListRow_;
164 >    vector<vector<int> > groupListCol_;
165 >
166 >    vector<RealType> massFactorsRow;
167 >    vector<RealType> massFactorsCol;
168   #endif
148    vector<RealType> pot_local;
169  
170    };
171  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines