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 1538 by chuckv, Tue Jan 11 18:58:12 2011 UTC vs.
branches/development/src/parallel/ForceMatrixDecomposition.hpp (file contents), Revision 1568 by gezelter, Wed May 25 16:20:37 2011 UTC

# Line 1 | Line 1
1 < /**
2 < * @file ForceDecomposition.cpp
3 < * @author Charles Vardeman <cvardema.at.nd.edu>
4 < * @date 08/18/2010
5 < * @time 11:56am
6 < * @version 1.0
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
8 – * @section LICENSE
9 – * Copyright (c) 2010 The University of Notre Dame. All Rights Reserved.
10 – *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
6   * redistribute this software in source and binary code form, provided
# Line 45 | Line 38
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39   * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41 +
42 + #ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
43 + #define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
44  
45 + #include "parallel/ForceDecomposition.hpp"
46 + #include "math/SquareMatrix3.hpp"
47 + #include "brains/Snapshot.hpp"
48  
49 < /*  -*- c++ -*-  */
50 < #ifndef FORCEDECOMPOSITION_PARALLEL_HPP
51 < #define FORCEDECOMPOSITION_PARALLEL_HPP
49 > #ifdef IS_MPI
50 > #include "parallel/Communicator.hpp"
51 > #endif
52  
53 + using namespace std;
54 + namespace OpenMD {
55 +  
56 +  class ForceMatrixDecomposition : public ForceDecomposition {
57 +  public:
58 +    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {};
59  
60 < namespace OpenMD{
60 >    void distributeInitialData();
61 >    void distributeData();
62 >    void collectIntermediateData();
63 >    void distributeIntermediateData();
64 >    void collectData();
65  
66 < class ForceDecomposition
67 < {
59 < public:
60 <  ForceDecomposition();
61 <  virtual ~ForceDecomposition();
62 <  void gather();
63 <  void scatter();
64 <  
65 < protected:
66 < private:
67 <  int myRank_;
68 <  static bool isColumn_;
69 <  static int myIndex_:
70 < };
66 >    // neighbor list routines
67 >    vector<pair<int, int> >  buildNeighborList();
68  
69 +    // group bookkeeping
70 +    pair<int, int> getGroupTypes(int cg1, int cg2);
71  
72 +    // Group->atom bookkeeping
73 +    vector<int> getAtomsInGroupRow(int cg1);
74 +    vector<int> getAtomsInGroupColumn(int cg2);
75 +    Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
76 +    Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
77 +    RealType getMfactRow(int atom1);
78 +    RealType getMfactColumn(int atom2);
79  
80 < }
80 >    // spatial data
81 >    Vector3d getIntergroupVector(int cg1, int cg2);
82 >    Vector3d getInteratomicVector(int atom1, int atom2);
83 >      
84 >    // atom bookkeeping
85 >    vector<int> getAtomList();
86 >    vector<int> getSkipsForAtom(int atom1);
87 >    bool skipAtomPair(int atom1, int atom2);
88 >    void addForceToAtomRow(int atom1, Vector3d fg);
89 >    void addForceToAtomColumn(int atom2, Vector3d fg);
90  
91 +    // filling interaction blocks with pointers
92 +    InteractionData fillInteractionData(int atom1, int atom2);
93 +    InteractionData fillSkipData(int atom1, int atom2);
94  
95 +  private:
96 +    int nLocal_;
97 +    int nGroups_;
98  
99 + #ifdef IS_MPI    
100 +    DataStorage atomRowData;
101 +    DataStorage atomColData;
102 +    DataStorage cgRowData;
103 +    DataStorage cgColData;
104  
105 +    int nAtomsInRow_;
106 +    int nAtomsInCol_;
107 +    int nGroupsInRow_;
108 +    int nGroupsInCol_;
109  
110 +    Communicator<Row, int>* AtomCommIntRow;
111 +    Communicator<Row, RealType>* AtomCommRealRow;
112 +    Communicator<Row, Vector3d>* AtomCommVectorRow;
113 +    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
114  
115 +    Communicator<Column, int>* AtomCommIntColumn;
116 +    Communicator<Column, RealType>* AtomCommRealColumn;
117 +    Communicator<Column, Vector3d>* AtomCommVectorColumn;
118 +    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
119  
120 +    Communicator<Row, int>* cgCommIntRow;
121 +    Communicator<Row, Vector3d>* cgCommVectorRow;
122 +    Communicator<Column, int>* cgCommIntColumn;
123 +    Communicator<Column, Vector3d>* cgCommVectorColumn;
124  
125 +    vector<vector<RealType> > pot_row;
126 +    vector<vector<RealType> > pot_col;
127 +    vector<int> identsRow;
128 +    vector<int> identsCol;
129 +
130 +    vector<int> AtomLocalToGlobal;
131 +    vector<int> AtomRowToGlobal;
132 +    vector<int> AtomColToGlobal;
133 +    vector<int> cgLocalToGlobal;
134 +    vector<int> cgRowToGlobal;
135 +    vector<int> cgColToGlobal;
136 +
137 +    vector<vector<int> > cellListRow_;
138 +    vector<vector<int> > cellListCol_;
139   #endif
140 +    vector<RealType> pot_local;
141  
142 +  };
143  
144 + }
145 + #endif
146 +

Diff Legend

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