--- branches/development/src/primitives/RigidBody.cpp	2012/07/06 22:01:58	1767
+++ branches/development/src/primitives/RigidBody.cpp	2013/01/30 14:43:08	1844
@@ -74,9 +74,7 @@ namespace OpenMD {
   
   void RigidBody::setA(const RotMat3x3d& a, int snapshotNo) {
     ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).aMat[localIndex_] = a;
-    
-    //((snapshotMan_->getSnapshot(snapshotNo))->*storage_).electroFrame[localIndex_] = a.transpose() * sU_;    
-    
+        
     for (unsigned int i = 0 ; i < atoms_.size(); ++i){
       if (atoms_[i]->isDirectional()) {
 	atoms_[i]->setA(refOrients_[i].transpose() * a, snapshotNo);
@@ -94,7 +92,8 @@ namespace OpenMD {
     Vector3d force;
     Vector3d torque;
     Vector3d myEuler;
-    RealType phi, theta, psi;
+    RealType phi, theta;
+    // RealType psi;
     RealType cphi, sphi, ctheta, stheta;
     Vector3d ephi;
     Vector3d etheta;
@@ -106,7 +105,7 @@ namespace OpenMD {
     
     phi = myEuler[0];
     theta = myEuler[1];
-    psi = myEuler[2];
+    // psi = myEuler[2];
     
     cphi = cos(phi);
     sphi = sin(phi);
@@ -227,10 +226,18 @@ namespace OpenMD {
     Vector3d apos;
     Vector3d rpos;
     Vector3d frc(0.0);
-    Vector3d trq(0.0);    
+    Vector3d trq(0.0);
+    Vector3d ef(0.0);
     Vector3d pos = this->getPos();
+    AtomType* atype;
+    int eCount = 0;
+    
+    int sl = ((snapshotMan_->getCurrentSnapshot())->*storage_).getStorageLayout();
+    
     for (unsigned int i = 0; i < atoms_.size(); i++) {
 
+      atype = atoms_[i]->getAtomType();
+
       afrc = atoms_[i]->getFrc();
       apos = atoms_[i]->getPos();
       rpos = apos - pos;
@@ -247,10 +254,21 @@ namespace OpenMD {
       if (atoms_[i]->isDirectional()) {
 	atrq = atoms_[i]->getTrq();
 	trq += atrq;
-      }      
+      }
+
+      if ((sl & DataStorage::dslElectricField) && (atype->isElectrostatic())) {
+        ef += atoms_[i]->getElectricField();
+        eCount++;
+      }
     }         
     addFrc(frc);
     addTrq(trq);    
+
+    if (sl & DataStorage::dslElectricField)  {
+      ef /= eCount;
+      setElectricField(ef);
+    }
+
   }
 
   Mat3x3d RigidBody::calcForcesAndTorquesAndVirial() {
@@ -260,10 +278,16 @@ namespace OpenMD {
     Vector3d rpos;
     Vector3d dfrc;
     Vector3d frc(0.0);
-    Vector3d trq(0.0);    
+    Vector3d trq(0.0);
+    Vector3d ef(0.0);
+    AtomType* atype;
+    int eCount = 0;
+
     Vector3d pos = this->getPos();
     Mat3x3d tau_(0.0);
 
+    int sl = ((snapshotMan_->getCurrentSnapshot())->*storage_).getStorageLayout();
+
     for (unsigned int i = 0; i < atoms_.size(); i++) {
       
       afrc = atoms_[i]->getFrc();
@@ -282,6 +306,10 @@ namespace OpenMD {
       if (atoms_[i]->isDirectional()) {
 	atrq = atoms_[i]->getTrq();
 	trq += atrq;
+      }
+      if ((sl & DataStorage::dslElectricField) && (atype->isElectrostatic())) {
+        ef += atoms_[i]->getElectricField();
+        eCount++;
       }
       
       tau_(0,0) -= rpos[0]*afrc[0];
@@ -297,6 +325,12 @@ namespace OpenMD {
     }
     addFrc(frc);
     addTrq(trq);
+
+    if (sl & DataStorage::dslElectricField) {
+      ef /= eCount;
+      setElectricField(ef);
+    }
+
     return tau_;
   }