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 1592 by gezelter, Fri Jul 8 20:25:32 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, InteractionManager* iMan) : ForceDecomposition(info, iMan) {};
58 >    ForceMatrixDecomposition(SimInfo* info, InteractionManager* iMan);
59  
60      void distributeInitialData();
61      void zeroWorkArrays();
# Line 116 | Line 116 | namespace OpenMD {
116      int nGroupsInRow_;
117      int nGroupsInCol_;
118  
119 <    Communicator<Row, int>* AtomCommIntRow;
120 <    Communicator<Row, RealType>* AtomCommRealRow;
121 <    Communicator<Row, Vector3d>* AtomCommVectorRow;
122 <    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;
123 <    Communicator<Row, potVec>* AtomCommPotRow;
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;
126 <    Communicator<Column, potVec>* AtomCommPotColumn;
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 +    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;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines