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.
Revision 1541 by gezelter, Fri Feb 4 20:04:56 2011 UTC

# Line 46 | Line 46
46   #include "Parallel/Communicator.hpp"
47   #include "math/SquareMatrix3.hpp"
48  
49 + using namespace std;
50   namespace OpenMD {
51    
52    class ForceDecomposition : public Decomposition {
# Line 68 | Line 69 | namespace OpenMD {
69  
70   #ifdef IS_MPI
71      
72 <    Comm<I, RealType>* AtomCommRealI;
73 <    Comm<I, Vector3d>* AtomCommVectorI;
74 <    Comm<I, Mat3x3d>*  AtomCommMatrixI;
72 >    Communicator<Row, RealType>* AtomCommRealI;
73 >    Communicator<Row, Vector3d>* AtomCommVectorI;
74 >    Communicator<Row, Mat3x3d>*  AtomCommMatrixI;
75  
76 <    Comm<J, RealType>* AtomCommRealJ;
77 <    Comm<J, Vector3d>* AtomCommVectorJ;
78 <    Comm<J, Mat3x3d>*  AtomCommMatrixJ;
76 >    Communicator<Column, RealType>* AtomCommRealJ;
77 >    Communicator<Column, Vector3d>* AtomCommVectorJ;
78 >    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ;
79  
80 <    Comm<I, Vector3d>* cgCommVectorI;
81 <    Comm<J, Vector3d>* cgCommVectorJ;
82 <    
80 >    Communicator<Row, Vector3d>* cgCommVectorI;
81 >    Communicator<Column, Vector3d>* cgCommVectorJ;
82 >
83 >  private:
84 >    vector<vector<RealType> > pot_row;
85 >    vector<vector<RealType> > pot_col;
86 >    vector<vector<RealType> > pot_local;
87   #endif
88    };
89  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines