--- branches/development/src/parallel/ForceDecomposition.hpp	2011/01/14 22:31:31	1539
+++ branches/development/src/parallel/ForceDecomposition.hpp	2011/03/18 19:31:52	1544
@@ -43,14 +43,18 @@
 #define PARALLEL_FORCEDECOMPOSITION_HPP
 
 #include "Parallel/Decomposition.hpp"
-#include "Parallel/Communicator.hpp"
 #include "math/SquareMatrix3.hpp"
 
+#ifdef IS_MPI
+#include "Parallel/Communicator.hpp"
+#endif
+
+using namespace std;
 namespace OpenMD {
   
   class ForceDecomposition : public Decomposition {
   public:
-    ForceDecomposition(Snapshot* sman);
+    ForceDecomposition(SimInfo* info) : Decomposition(info) {sman_ = info_->getSnapshotManager();}
     void distributeInitialData();
     void distributeData();
     void collectIntermediateData();
@@ -66,20 +70,37 @@ namespace OpenMD {
     AtomType* getAtomTypeI(int whichAtomI);
     AtomType* getAtomTypeJ(int whichAtomJ);   
 
-#ifdef IS_MPI
-    
-    Comm<I, RealType>* AtomCommRealI; 
-    Comm<I, Vector3d>* AtomCommVectorI; 
-    Comm<I, Mat3x3d>*  AtomCommMatrixI; 
+  private: 
+    SnapshotManager* sman_;    
+#ifdef IS_MPI    
+    Communicator<Row, int>* AtomCommIntI;
+    Communicator<Row, RealType>* AtomCommRealI; 
+    Communicator<Row, Vector3d>* AtomCommVectorI; 
+    Communicator<Row, Mat3x3d>*  AtomCommMatrixI; 
 
-    Comm<J, RealType>* AtomCommRealJ; 
-    Comm<J, Vector3d>* AtomCommVectorJ; 
-    Comm<J, Mat3x3d>*  AtomCommMatrixJ; 
+    Communicator<Column, int>* AtomCommIntJ;
+    Communicator<Column, RealType>* AtomCommRealJ; 
+    Communicator<Column, Vector3d>* AtomCommVectorJ; 
+    Communicator<Column, Mat3x3d>*  AtomCommMatrixJ; 
 
-    Comm<I, Vector3d>* cgCommVectorI; 
-    Comm<J, Vector3d>* cgCommVectorJ; 
-    
+    Communicator<Row, int>* cgCommIntI;
+    Communicator<Row, Vector3d>* cgCommVectorI; 
+    Communicator<Column, int>* cgCommIntJ;
+    Communicator<Column, Vector3d>* cgCommVectorJ; 
+
+    vector<vector<RealType> > pot_row;
+    vector<vector<RealType> > pot_col;
+    vector<int> identRow;
+    vector<int> identCol;
+
+    vector<int> AtomLocalToGlobal;
+    vector<int> AtomRowToGlobal;
+    vector<int> AtomColToGlobal;
+    vector<int> cgLocalToGlobal;
+    vector<int> cgRowToGlobal;
+    vector<int> cgColToGlobal;
 #endif
+    vector<RealType> pot_local;
   };
 
 }