--- branches/development/src/primitives/RigidBody.cpp	2011/11/22 20:38:56	1665
+++ branches/development/src/primitives/RigidBody.cpp	2012/09/13 14:10:11	1798
@@ -53,7 +53,7 @@ namespace OpenMD {
   void RigidBody::setPrevA(const RotMat3x3d& a) {
     ((snapshotMan_->getPrevSnapshot())->*storage_).aMat[localIndex_] = a;
     
-    for (int i =0 ; i < atoms_.size(); ++i){
+    for (unsigned int i = 0 ; i < atoms_.size(); ++i){
       if (atoms_[i]->isDirectional()) {
 	atoms_[i]->setPrevA(refOrients_[i].transpose() * a);
       }
@@ -65,7 +65,7 @@ namespace OpenMD {
   void RigidBody::setA(const RotMat3x3d& a) {
     ((snapshotMan_->getCurrentSnapshot())->*storage_).aMat[localIndex_] = a;
 
-    for (int i =0 ; i < atoms_.size(); ++i){
+    for (unsigned int i = 0 ; i < atoms_.size(); ++i){
       if (atoms_[i]->isDirectional()) {
 	atoms_[i]->setA(refOrients_[i].transpose() * a);
       }
@@ -74,10 +74,8 @@ 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 (int i =0 ; i < atoms_.size(); ++i){
+        
+    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);
@@ -229,7 +228,7 @@ namespace OpenMD {
     Vector3d frc(0.0);
     Vector3d trq(0.0);    
     Vector3d pos = this->getPos();
-    for (int i = 0; i < atoms_.size(); i++) {
+    for (unsigned int i = 0; i < atoms_.size(); i++) {
 
       afrc = atoms_[i]->getFrc();
       apos = atoms_[i]->getPos();
@@ -264,7 +263,7 @@ namespace OpenMD {
     Vector3d pos = this->getPos();
     Mat3x3d tau_(0.0);
 
-    for (int i = 0; i < atoms_.size(); i++) {
+    for (unsigned int i = 0; i < atoms_.size(); i++) {
       
       afrc = atoms_[i]->getFrc();
       apos = atoms_[i]->getPos();
@@ -376,7 +375,7 @@ namespace OpenMD {
 
 
     Vector3d velRot;        
-    for (int i =0 ; i < refCoords_.size(); ++i) {
+    for (unsigned int i = 0 ; i < refCoords_.size(); ++i) {
       atoms_[i]->setVel(rbVel + mat * refCoords_[i]);
     }
 
@@ -405,7 +404,7 @@ namespace OpenMD {
 
 
     Vector3d velRot;        
-    for (int i =0 ; i < refCoords_.size(); ++i) {
+    for (unsigned int i = 0 ; i < refCoords_.size(); ++i) {
       atoms_[i]->setVel(rbVel + mat * refCoords_[i], frame);
     }