--- trunk/src/primitives/RigidBody.cpp	2005/10/03 15:54:23	642
+++ trunk/src/primitives/RigidBody.cpp	2006/03/15 17:35:12	899
@@ -51,11 +51,10 @@ namespace oopse {
 
   void RigidBody::setPrevA(const RotMat3x3d& a) {
     ((snapshotMan_->getPrevSnapshot())->*storage_).aMat[localIndex_] = a;
-    //((snapshotMan_->getPrevSnapshot())->*storage_).electroFrame[localIndex_] = a.transpose() * sU_;
 
     for (int i =0 ; i < atoms_.size(); ++i){
       if (atoms_[i]->isDirectional()) {
-	atoms_[i]->setPrevA(a * refOrients_[i]);
+	atoms_[i]->setPrevA(refOrients_[i].transpose() * a);
       }
     }
 
@@ -64,11 +63,10 @@ namespace oopse {
       
   void RigidBody::setA(const RotMat3x3d& a) {
     ((snapshotMan_->getCurrentSnapshot())->*storage_).aMat[localIndex_] = a;
-    //((snapshotMan_->getCurrentSnapshot())->*storage_).electroFrame[localIndex_] = a.transpose() * sU_;
 
     for (int i =0 ; i < atoms_.size(); ++i){
       if (atoms_[i]->isDirectional()) {
-	atoms_[i]->setA(a * refOrients_[i]);
+	atoms_[i]->setA(refOrients_[i].transpose() * a);
       }
     }
   }    
@@ -79,7 +77,7 @@ namespace oopse {
 
     for (int i =0 ; i < atoms_.size(); ++i){
       if (atoms_[i]->isDirectional()) {
-	atoms_[i]->setA(a * refOrients_[i], snapshotNo);
+	atoms_[i]->setA(refOrients_[i].transpose() * a, snapshotNo);
       }
     }
 
@@ -173,16 +171,16 @@ namespace oopse {
       IAtom(0, 0) += mtmp * r2;
       IAtom(1, 1) += mtmp * r2;
       IAtom(2, 2) += mtmp * r2;
+      Itmp += IAtom;
 
       //project the inertial moment of directional atoms into this rigid body
       if (atoms_[i]->isDirectional()) {
-        IAtom += atoms_[i]->getI();
-        Itmp += refOrients_[i].transpose() * IAtom * refOrients_[i];
-      } else {
-        Itmp += IAtom;
-      }
+        Itmp += refOrients_[i].transpose() * atoms_[i]->getI() * refOrients_[i];
+      } 
     }
 
+    //    std::cout << Itmp << std::endl;
+
     //diagonalize 
     Vector3d evals;
     Mat3x3d::diagonalize(Itmp, evals, sU_);
@@ -247,8 +245,8 @@ namespace oopse {
         
     }
     
-    setFrc(frc);
-    setTrq(trq);
+    addFrc(frc);
+    addTrq(trq);
     
   }
 
@@ -271,7 +269,7 @@ namespace oopse {
       if (atoms_[i]->isDirectional()) {
           
 	dAtom = (DirectionalAtom *) atoms_[i];
-	dAtom->setA(refOrients_[i] * a);
+	dAtom->setA(refOrients_[i].transpose() * a);
       }
 
     }
@@ -298,7 +296,7 @@ namespace oopse {
       if (atoms_[i]->isDirectional()) {
           
 	dAtom = (DirectionalAtom *) atoms_[i];
-	dAtom->setA(refOrients_[i] * a, frame);
+	dAtom->setA(refOrients_[i].transpose() * a, frame);
       }
 
     }
@@ -483,7 +481,7 @@ namespace oopse {
 	       "RigidBody error.\n"
 	       "\tAtom %s does not have a position specified.\n"
 	       "\tThis means RigidBody cannot set up reference coordinates.\n",
-	       ats->getType() );
+	       ats->getType().c_str() );
       painCave.isFatal = 1;
       simError();
     }
@@ -503,7 +501,7 @@ namespace oopse {
 		 "RigidBody error.\n"
 		 "\tAtom %s does not have an orientation specified.\n"
 		 "\tThis means RigidBody cannot set up reference orientations.\n",
-		 ats->getType() );
+		 ats->getType().c_str() );
 	painCave.isFatal = 1;
 	simError();
       }