--- branches/development/src/parallel/ForceMatrixDecomposition.hpp	2011/05/26 13:55:04	1569
+++ branches/development/src/parallel/ForceMatrixDecomposition.hpp	2011/06/08 16:05:07	1576
@@ -58,6 +58,7 @@ namespace OpenMD {
     ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {};
 
     void distributeInitialData();
+    void zeroWorkArrays();
     void distributeData();
     void collectIntermediateData();
     void distributeIntermediateData();
@@ -67,7 +68,7 @@ namespace OpenMD {
     vector<pair<int, int> >  buildNeighborList();
 
     // group bookkeeping
-    pair<int, int> getGroupTypes(int cg1, int cg2);
+    groupCutoffs getGroupCutoffs(int cg1, int cg2);
 
     // Group->atom bookkeeping
     vector<int> getAtomsInGroupRow(int cg1);
@@ -82,23 +83,32 @@ namespace OpenMD {
     Vector3d getInteratomicVector(int atom1, int atom2);
        
     // atom bookkeeping
-    vector<int> getAtomList();
-    vector<int> getSkipsForAtom(int atom1);
+    int getNAtomsInRow();
+    vector<int> getSkipsForRowAtom(int atom1);
+    int getTopoDistance(int atom1, int atom2);
     bool skipAtomPair(int atom1, int atom2);
     void addForceToAtomRow(int atom1, Vector3d fg);
     void addForceToAtomColumn(int atom2, Vector3d fg);
 
     // filling interaction blocks with pointers
     InteractionData fillInteractionData(int atom1, int atom2);
+    void unpackInteractionData(InteractionData idat, int atom1, int atom2);
     InteractionData fillSkipData(int atom1, int atom2);
 
   private: 
+    void createGtypeCutoffMap();
+
     int nLocal_;
     int nGroups_;
+    vector<int> identsLocal;
     vector<int> AtomLocalToGlobal;
     vector<int> cgLocalToGlobal;
-    vector<RealType> pot_local;
     vector<RealType> massFactorsLocal;
+    vector<vector<int> > skipsForLocalAtom;
+    vector<vector<int> > toposForLocalAtom;
+    vector<vector<int> > topoDistLocal;
+    vector<RealType> groupCutoff;
+    vector<int> groupToGtype;
 
 #ifdef IS_MPI    
     DataStorage atomRowData;
@@ -115,29 +125,41 @@ namespace OpenMD {
     Communicator<Row, RealType>* AtomCommRealRow; 
     Communicator<Row, Vector3d>* AtomCommVectorRow; 
     Communicator<Row, Mat3x3d>*  AtomCommMatrixRow; 
+    Communicator<Row, potVec>* AtomCommPotRow;
 
     Communicator<Column, int>* AtomCommIntColumn;
     Communicator<Column, RealType>* AtomCommRealColumn; 
     Communicator<Column, Vector3d>* AtomCommVectorColumn; 
-    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn; 
+    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;
+    Communicator<Column, potVec>* AtomCommPotColumn; 
 
     Communicator<Row, int>* cgCommIntRow;
     Communicator<Row, Vector3d>* cgCommVectorRow; 
     Communicator<Column, int>* cgCommIntColumn;
     Communicator<Column, Vector3d>* cgCommVectorColumn; 
 
-    vector<vector<RealType> > pot_row;
-    vector<vector<RealType> > pot_col;
+    // work arrays for assembling potential energy
+    vector<potVec> pot_row;
+    vector<potVec> pot_col;
+    potVec pot_local;
 
     vector<int> identsRow;
     vector<int> identsCol;
 
+    vector<AtomType*> atypesRow;
+    vector<AtomType*> atypesCol;
+
     vector<int> AtomRowToGlobal;
     vector<int> AtomColToGlobal;
 
     vector<int> cgRowToGlobal;
     vector<int> cgColToGlobal;
 
+    vector<RealType> groupCutoffRow;
+    vector<RealType> groupCutoffCol;
+    vector<int> groupColToGtype;
+    vector<int> groupRowToGtype;
+
     vector<vector<int> > cellListRow_;
     vector<vector<int> > cellListCol_;
 
@@ -147,6 +169,9 @@ namespace OpenMD {
     vector<RealType> massFactorsRow;
     vector<RealType> massFactorsCol;
 
+    vector<vector<int> > skipsForRowAtom;
+    vector<vector<int> > toposForRowAtom;
+    vector<vector<int> > topoDistRow;
 #endif
 
   };