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/ForceDecomposition.hpp (file contents), Revision 1539 by gezelter, Fri Jan 14 22:31:31 2011 UTC vs.
branches/development/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC

# Line 39 | Line 39
39   * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42 < #ifndef PARALLEL_FORCEDECOMPOSITION_HPP
43 < #define PARALLEL_FORCEDECOMPOSITION_HPP
42 > #ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
43 > #define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
44  
45 < #include "Parallel/Decomposition.hpp"
46 < #include "Parallel/Communicator.hpp"
45 > #include "Parallel/ForceDecomposition.hpp"
46   #include "math/SquareMatrix3.hpp"
47  
48 + #ifdef IS_MPI
49 + #include "Parallel/Communicator.hpp"
50 + #endif
51 +
52 + using namespace std;
53   namespace OpenMD {
54    
55 <  class ForceDecomposition : public Decomposition {
55 >  class ForceMatrixDecomposition : public ForceDecomposition {
56    public:
57 <    ForceDecomposition(Snapshot* sman);
57 >    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {sman_ = info_->getSnapshotManager();}
58      void distributeInitialData();
59      void distributeData();
60      void collectIntermediateData();
61      void distributeIntermediateData();
62      void collectData();
63  
64 <    unsigned int getNcutoffGroupsI();
65 <    unsigned int getNcutoffGroupsJ();
64 >    // neighbor list routines
65 >    bool checkNeighborList();
66 >    vector<pair<int, int> >  buildNeighborList();
67  
68 <    vector<int> getAtomsInGroupI(int whichCGI);
69 <    vector<int> getAtomsInGroupJ(int whichCGJ);
68 >    // group bookkeeping
69 >    pair<int, int> getGroupTypes(int cg1, int cg2);
70  
71 <    AtomType* getAtomTypeI(int whichAtomI);
72 <    AtomType* getAtomTypeJ(int whichAtomJ);  
71 >    // Group->atom bookkeeping
72 >    vector<int> getAtomsInGroupRow(int cg1);
73 >    vector<int> getAtomsInGroupColumn(int cg2);
74 >    Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
75 >    Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
76 >    RealType getMfactRow(int atom1);
77 >    RealType getMfactColumn(int atom2);
78  
79 < #ifdef IS_MPI
80 <    
81 <    Comm<I, RealType>* AtomCommRealI;
82 <    Comm<I, Vector3d>* AtomCommVectorI;
83 <    Comm<I, Mat3x3d>*  AtomCommMatrixI;
79 >    // spatial data
80 >    Vector3d getIntergroupVector(int cg1, int cg2);
81 >    Vector3d getInteratomicVector(int atom1, int atom2);
82 >      
83 >    // atom bookkeeping
84 >    vector<int> getAtomList();
85 >    vector<int> getSkipsForAtom(int atom1);
86 >    bool skipAtomPair(int atom1, int atom2);
87 >    void addForceToAtomRow(int atom1, Vector3d fg);
88 >    void addForceToAtomColumn(int atom2, Vector3d fg);
89  
90 <    Comm<J, RealType>* AtomCommRealJ;
91 <    Comm<J, Vector3d>* AtomCommVectorJ;
92 <    Comm<J, Mat3x3d>*  AtomCommMatrixJ;
90 >    // filling interaction blocks with pointers
91 >    InteractionData fillInteractionData(int atom1, int atom2);
92 >    InteractionData fillSkipData(int atom1, int atom2);
93 >    SelfData fillSelfData(int atom1);
94  
95 <    Comm<I, Vector3d>* cgCommVectorI;
96 <    Comm<J, Vector3d>* cgCommVectorJ;
97 <    
95 >  private:
96 >    SnapshotManager* sman_;    
97 > #ifdef IS_MPI    
98 >    Communicator<Row, int>* AtomCommIntRow;
99 >    Communicator<Row, RealType>* AtomCommRealRow;
100 >    Communicator<Row, Vector3d>* AtomCommVectorRow;
101 >    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
102 >
103 >    Communicator<Column, int>* AtomCommIntColumn;
104 >    Communicator<Column, RealType>* AtomCommRealColumn;
105 >    Communicator<Column, Vector3d>* AtomCommVectorColumn;
106 >    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
107 >
108 >    Communicator<Row, int>* cgCommIntRow;
109 >    Communicator<Row, Vector3d>* cgCommVectorRow;
110 >    Communicator<Column, int>* cgCommIntColumn;
111 >    Communicator<Column, Vector3d>* cgCommVectorColumn;
112 >
113 >    vector<vector<RealType> > pot_row;
114 >    vector<vector<RealType> > pot_col;
115 >    vector<int> identsRow;
116 >    vector<int> identsCol;
117 >
118 >    vector<int> AtomLocalToGlobal;
119 >    vector<int> AtomRowToGlobal;
120 >    vector<int> AtomColToGlobal;
121 >    vector<int> cgLocalToGlobal;
122 >    vector<int> cgRowToGlobal;
123 >    vector<int> cgColToGlobal;
124   #endif
125 +    vector<RealType> pot_local;
126    };
127  
128   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines