--- branches/development/src/parallel/ForceDecomposition.cpp	2011/01/14 22:31:31	1539
+++ branches/development/src/parallel/ForceDecomposition.cpp	2011/02/04 20:04:56	1541
@@ -42,25 +42,37 @@
 #include "parallel/Communicator.hpp"
 #include "math/SquareMatrix3.hpp"
 
+using namespace std;
 namespace OpenMD {
 
   void ForceDecomposition::distributeInitialData() {
 #ifdef IS_MPI
+    Snapshot* snap = sman_->getCurrentSnapshot();
+    int nAtoms = snap->getNumberOfAtoms();
+    int nGroups = snap->getNumberOfCutoffGroups();
 
-    int nAtoms;
-    int nGroups;
+    AtomCommRealI = new Communicator<Row,RealType>(nAtoms);
+    AtomCommVectorI = new Communicator<Row,Vector3d>(nAtoms);
+    AtomCommMatrixI = new Communicator<Row,Mat3x3d>(nAtoms);
 
-    AtomCommRealI = new Comm<I,RealType>(nAtoms);
-    AtomCommVectorI = new Comm<I,Vector3d>(nAtoms);
-    AtomCommMatrixI = new Comm<I,Mat3x3d>(nAtoms);
+    AtomCommRealJ = new Communicator<Column,RealType>(nAtoms);
+    AtomCommVectorJ = new Communicator<Column,Vector3d>(nAtoms);
+    AtomCommMatrixJ = new Communicator<Column,Mat3x3d>(nAtoms);
 
-    AtomCommRealJ = new Comm<J,RealType>(nAtoms);
-    AtomCommVectorJ = new Comm<J,Vector3d>(nAtoms);
-    AtomCommMatrixJ = new Comm<J,Mat3x3d>(nAtoms);
+    cgCommVectorI = new Communicator<Row,Vector3d>(nGroups);
+    cgCommVectorJ = new Communicator<Column,Vector3d>(nGroups);
 
-    cgCommVectorI = new Comm<I,Vector3d>(nGroups);
-    cgCommVectorJ = new Comm<J,Vector3d>(nGroups);
-    // more to come
+    int nInRow = AtomCommRealI.getSize();
+    int nInCol = AtomCommRealJ.getSize();
+
+    vector<vector<RealType> > pot_row(LR_POT_TYPES, 
+                                      vector<RealType> (nInRow, 0.0));
+    vector<vector<RealType> > pot_col(LR_POT_TYPES,
+                                      vector<RealType> (nInCol, 0.0));
+
+    vector<vector<RealType> > pot_local(LR_POT_TYPES, 
+                                        vector<RealType> (nAtoms, 0.0));
+
 #endif
   }
     
@@ -69,33 +81,33 @@ namespace OpenMD {
   void ForceDecomposition::distributeData()  {
 #ifdef IS_MPI
     Snapshot* snap = sman_->getCurrentSnapshot();
-
+    
     // gather up the atomic positions
     AtomCommVectorI->gather(snap->atomData.position, 
                             snap->atomIData.position);
     AtomCommVectorJ->gather(snap->atomData.position, 
-                           snap->atomJData.position);
+                            snap->atomJData.position);
     
     // gather up the cutoff group positions
     cgCommVectorI->gather(snap->cgData.position, 
-                         snap->cgIData.position);
+                          snap->cgIData.position);
     cgCommVectorJ->gather(snap->cgData.position, 
-                         snap->cgJData.position);
+                          snap->cgJData.position);
     
     // if needed, gather the atomic rotation matrices
     if (snap->atomData.getStorageLayout() & DataStorage::dslAmat) {
       AtomCommMatrixI->gather(snap->atomData.aMat, 
-                             snap->atomIData.aMat);
+                              snap->atomIData.aMat);
       AtomCommMatrixJ->gather(snap->atomData.aMat, 
-                             snap->atomJData.aMat);
+                              snap->atomJData.aMat);
     }
     
     // if needed, gather the atomic eletrostatic frames
     if (snap->atomData.getStorageLayout() & DataStorage::dslElectroFrame) {
       AtomCommMatrixI->gather(snap->atomData.electroFrame, 
-                             snap->atomIData.electroFrame);
+                              snap->atomIData.electroFrame);
       AtomCommMatrixJ->gather(snap->atomData.electroFrame, 
-                             snap->atomJData.electroFrame);
+                              snap->atomJData.electroFrame);
     }
 #endif      
   }
@@ -103,14 +115,14 @@ namespace OpenMD {
   void ForceDecomposition::collectIntermediateData() {
 #ifdef IS_MPI
     Snapshot* snap = sman_->getCurrentSnapshot();
-    // gather up the atomic positions
     
     if (snap->atomData.getStorageLayout() & DataStorage::dslDensity) {
+
       AtomCommRealI->scatter(snap->atomIData.density, 
-                            snap->atomData.density);
-      std::vector<RealType> rho_tmp;
-      int n = snap->getNumberOfAtoms();
-      rho_tmp.reserve( n );
+                             snap->atomData.density);
+
+      int n = snap->atomData.density.size();
+      std::vector<RealType> rho_tmp(n, 0.0);
       AtomCommRealJ->scatter(snap->atomJData.density, rho_tmp);
       for (int i = 0; i < n; i++)
         snap->atomData.density[i] += rho_tmp[i];
@@ -123,16 +135,16 @@ namespace OpenMD {
     Snapshot* snap = sman_->getCurrentSnapshot();
     if (snap->atomData.getStorageLayout() & DataStorage::dslFunctional) {
       AtomCommRealI->gather(snap->atomData.functional, 
-                           snap->atomIData.functional);
+                            snap->atomIData.functional);
       AtomCommRealJ->gather(snap->atomData.functional, 
-                           snap->atomJData.functional);
+                            snap->atomJData.functional);
     }
     
     if (snap->atomData.getStorageLayout() & DataStorage::dslFunctionalDerivative) {
       AtomCommRealI->gather(snap->atomData.functionalDerivative, 
-                           snap->atomIData.functionalDerivative);
+                            snap->atomIData.functionalDerivative);
       AtomCommRealJ->gather(snap->atomData.functionalDerivative, 
-                           snap->atomJData.functionalDerivative);
+                            snap->atomJData.functionalDerivative);
     }
 #endif
   }
@@ -140,6 +152,51 @@ namespace OpenMD {
   
   void ForceDecomposition::collectData() {
 #ifdef IS_MPI
+    Snapshot* snap = sman_->getCurrentSnapshot();
+    
+    int n = snap->atomData.force.size();
+    std::vector<Vector3d> frc_tmp(n, 0.0);
+    
+    AtomCommVectorI->scatter(snap->atomIData.force, frc_tmp);
+    for (int i = 0; i < n; i++) {
+      snap->atomData.force[i] += frc_tmp[i];
+      frc_tmp[i] = 0.0;
+    }
+    
+    AtomCommVectorJ->scatter(snap->atomJData.force, frc_tmp);
+    for (int i = 0; i < n; i++)
+      snap->atomData.force[i] += frc_tmp[i];
+    
+    
+    if (snap->atomData.getStorageLayout() & DataStorage::dslTorque) {
+
+      int nt = snap->atomData.force.size();
+      std::vector<Vector3d> trq_tmp(nt, 0.0);
+
+      AtomCommVectorI->scatter(snap->atomIData.torque, trq_tmp);
+      for (int i = 0; i < n; i++) {
+        snap->atomData.torque[i] += trq_tmp[i];
+        trq_tmp[i] = 0.0;
+      }
+      
+      AtomCommVectorJ->scatter(snap->atomJData.torque, trq_tmp);
+      for (int i = 0; i < n; i++)
+        snap->atomData.torque[i] += trq_tmp[i];
+    }
+    
+    
+    vector<vector<RealType> > pot_temp(LR_POT_TYPES, 
+                                       vector<RealType> (nAtoms, 0.0));
+    
+    for (int i = 0; i < LR_POT_TYPES; i++) {
+      AtomCommRealI->scatter(pot_row[i], pot_temp[i]);
+      for (int ii = 0;  ii < pot_temp[i].size(); ii++ ) {
+        pot_local[i] += pot_temp[i][ii];
+      }
+    }
+    
+
+
 #endif
   }