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/ForceMatrixDecomposition.hpp (file contents), Revision 1551 by gezelter, Thu Apr 28 18:38:21 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 42 | Line 42
42   #ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
43   #define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
44  
45 < #include "Parallel/ForceDecomposition.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"
50 > #include "parallel/Communicator.hpp"
51   #endif
52  
53   using namespace std;
# 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 +    // neighbor list routines based on Rapaport
70 +    vector<vector<int> > buildLayerBasedNeighborList();
71  
72      // group bookkeeping
73 <    pair<int, int> getGroupTypes(int cg1, int cg2);
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 getMfactRow(int atom1);
81 <    RealType getMfactColumn(int atom2);
80 >    RealType getMassFactorRow(int atom1);
81 >    RealType getMassFactorColumn(int atom2);
82  
83      // spatial data
84      Vector3d getIntergroupVector(int cg1, int cg2);
85      Vector3d getInteratomicVector(int atom1, int atom2);
86        
87      // atom bookkeeping
88 <    vector<int> getAtomList();
89 <    vector<int> getSkipsForAtom(int atom1);
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      // filling interaction blocks with pointers
97 <    InteractionData fillInteractionData(int atom1, int atom2);
98 <    InteractionData fillSkipData(int atom1, int atom2);
94 <    SelfData fillSelfData(int atom1);
97 >    void fillInteractionData(InteractionData &idat, int atom1, int atom2);
98 >    void unpackInteractionData(InteractionData &idat, int atom1, int atom2);
99  
100    private:
101 <    SnapshotManager* sman_;    
98 <    Snapshot* snap_;
99 <    int storageLayout_;
100 < #ifdef IS_MPI    
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 <    Communicator<Row, int>* AtomCommIntRow;
117 <    Communicator<Row, RealType>* AtomCommRealRow;
118 <    Communicator<Row, Vector3d>* AtomCommVectorRow;
119 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
116 >    int nAtomsInRow_;
117 >    int nAtomsInCol_;
118 >    int nGroupsInRow_;
119 >    int nGroupsInCol_;
120  
121 <    Communicator<Column, int>* AtomCommIntColumn;
122 <    Communicator<Column, RealType>* AtomCommRealColumn;
114 <    Communicator<Column, Vector3d>* AtomCommVectorColumn;
115 <    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
121 >    Communicator<Row> rowComm;
122 >    Communicator<Column> colComm;
123  
124 <    Communicator<Row, int>* cgCommIntRow;
125 <    Communicator<Row, Vector3d>* cgCommVectorRow;
126 <    Communicator<Column, int>* cgCommIntColumn;
127 <    Communicator<Column, Vector3d>* cgCommVectorColumn;
124 >    Plan<int>* AtomPlanIntRow;
125 >    Plan<RealType>* AtomPlanRealRow;
126 >    Plan<Vector3d>* AtomPlanVectorRow;
127 >    Plan<Mat3x3d>*  AtomPlanMatrixRow;
128 >    Plan<potVec>* AtomPlanPotRow;
129  
130 <    vector<vector<RealType> > pot_row;
131 <    vector<vector<RealType> > pot_col;
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<int> AtomLocalToGlobal;
148 >    vector<AtomType*> atypesRow;
149 >    vector<AtomType*> atypesCol;
150 >
151      vector<int> AtomRowToGlobal;
152      vector<int> AtomColToGlobal;
153 <    vector<int> cgLocalToGlobal;
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 <    vector<RealType> pot_local;
171 >
172    };
173  
174   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines