--- branches/development/src/parallel/ForceDecomposition.hpp	2011/01/11 18:58:12	1538
+++ branches/development/src/parallel/ForceMatrixDecomposition.hpp	2011/05/24 21:24:45	1567
@@ -1,13 +1,6 @@
-/**
- * @file ForceDecomposition.cpp
- * @author Charles Vardeman <cvardema.at.nd.edu>
- * @date 08/18/2010
- * @time 11:56am
- * @version 1.0
+/*
+ * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
- * @section LICENSE
- * Copyright (c) 2010 The University of Notre Dame. All Rights Reserved.
- *
  * The University of Notre Dame grants you ("Licensee") a
  * non-exclusive, royalty free, license to use, modify and
  * redistribute this software in source and binary code form, provided
@@ -45,41 +38,117 @@
  * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
  * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
+ 
+#ifndef PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
+#define PARALLEL_FORCEMATRIXDECOMPOSITION_HPP
 
+#include "parallel/ForceDecomposition.hpp"
+#include "math/SquareMatrix3.hpp"
+#include "brains/Snapshot.hpp"
 
-/*  -*- c++ -*-  */
-#ifndef FORCEDECOMPOSITION_PARALLEL_HPP
-#define FORCEDECOMPOSITION_PARALLEL_HPP
+#ifdef IS_MPI
+#include "parallel/Communicator.hpp"
+#endif
 
+using namespace std;
+namespace OpenMD {
+  
+  class ForceMatrixDecomposition : public ForceDecomposition {
+  public:
+    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {sman_ = info_->getSnapshotManager();}
+    void distributeInitialData();
+    void distributeData();
+    void collectIntermediateData();
+    void distributeIntermediateData();
+    void collectData();
 
-namespace OpenMD{
+    // neighbor list routines
+    bool checkNeighborList();
+    vector<pair<int, int> >  buildNeighborList();
 
-class ForceDecomposition
-{
- public:
-  ForceDecomposition();
-  virtual ~ForceDecomposition();
-  void gather();
-  void scatter();
-  
- protected:
- private:
-  int myRank_;
-  static bool isColumn_;
-  static int myIndex_:
-};
+    // group bookkeeping
+    pair<int, int> getGroupTypes(int cg1, int cg2);
 
+    // Group->atom bookkeeping
+    vector<int> getAtomsInGroupRow(int cg1);
+    vector<int> getAtomsInGroupColumn(int cg2);
+    Vector3d getAtomToGroupVectorRow(int atom1, int cg1);
+    Vector3d getAtomToGroupVectorColumn(int atom2, int cg2);
+    RealType getMfactRow(int atom1);
+    RealType getMfactColumn(int atom2);
 
+    // spatial data
+    Vector3d getIntergroupVector(int cg1, int cg2);
+    Vector3d getInteratomicVector(int atom1, int atom2);
+       
+    // atom bookkeeping
+    vector<int> getAtomList();
+    vector<int> getSkipsForAtom(int atom1);
+    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);
+    InteractionData fillSkipData(int atom1, int atom2);
+    SelfData fillSelfData(int atom1);
 
+  private: 
+    SnapshotManager* sman_;    
+    Snapshot* snap_;
+    int storageLayout_;
+    vector<Vector3i> Cells;
 
+    int nLocal_;
+    int nGroups_;
 
+#ifdef IS_MPI    
+    DataStorage atomRowData;
+    DataStorage atomColData;
+    DataStorage cgRowData;
+    DataStorage cgColData;
 
+    int nAtomsInRow_; 
+    int nAtomsInCol_;
+    int nGroupsInRow_;
+    int nGroupsInCol_;
 
+    Communicator<Row, int>* AtomCommIntRow;
+    Communicator<Row, RealType>* AtomCommRealRow; 
+    Communicator<Row, Vector3d>* AtomCommVectorRow; 
+    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow; 
 
+    Communicator<Column, int>* AtomCommIntColumn;
+    Communicator<Column, RealType>* AtomCommRealColumn; 
+    Communicator<Column, Vector3d>* AtomCommVectorColumn; 
+    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn; 
 
+    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;
+    vector<int> identsRow;
+    vector<int> identsCol;
+
+    vector<int> AtomLocalToGlobal;
+    vector<int> AtomRowToGlobal;
+    vector<int> AtomColToGlobal;
+    vector<int> cgLocalToGlobal;
+    vector<int> cgRowToGlobal;
+    vector<int> cgColToGlobal;
+
+    vector<vector<int> > CellListRow;
+    vector<vector<int> > CellListCol;
+#else 
+    vector<vector<int> > CellList;
 #endif
+    vector<RealType> pot_local;
 
+  };
 
+}
+#endif
+