--- trunk/test/brains/RigidBody.cpp	2004/11/01 19:57:07	197
+++ branches/development/test/brains/RigidBody.cpp	2010/07/09 23:08:25	1465
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2000-2004  Object Oriented Parallel Simulation Engine (OOPSE) project
+ * Copyright (C) 2000-2009  The Open Molecular Dynamics Engine (OpenMD) project
  * 
- * Contact: oopse@oopse.org
+ * Contact: gezelter@openscience.org
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -25,7 +25,7 @@
 
 #include "primitives/RigidBody.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
 RigidBody::RigidBody() : StuntDouble(otRigidBody, &Snapshot::rigidbodyData){
 
@@ -33,7 +33,7 @@ void RigidBody::setPrevA(const RotMat3x3d& a) {
 
 void RigidBody::setPrevA(const RotMat3x3d& a) {
     ((snapshotMan_->getPrevSnapshot())->*storage_).aMat[localIndex_] = a;
-    ((snapshotMan_->getPrevSnapshot())->*storage_).unitVector[localIndex_] = a.inverse() * sU_.getColum(2);
+    ((snapshotMan_->getPrevSnapshot())->*storage_).unitVector[localIndex_] = a.inverse() * sU_.getColumn(2);
 
     std::vector<Atom*>::iterator i;
     for (i = atoms_.begin(); i != atoms_.end(); ++i) {
@@ -47,7 +47,7 @@ void RigidBody::setA(const RotMat3x3d& a) {
       
 void RigidBody::setA(const RotMat3x3d& a) {
     ((snapshotMan_->getCurrentSnapshot())->*storage_).aMat[localIndex_] = a;
-    ((snapshotMan_->getCurrentSnapshot())->*storage_).unitVector[localIndex_] = a.inverse() * sU_.getColum(2);
+    ((snapshotMan_->getCurrentSnapshot())->*storage_).unitVector[localIndex_] = a.inverse() * sU_.getColumn(2);
 
     std::vector<Atom*>::iterator i;
     for (i = atoms_.begin(); i != atoms_.end(); ++i) {
@@ -59,7 +59,7 @@ void RigidBody::setA(const RotMat3x3d& a, int snapshot
     
 void RigidBody::setA(const RotMat3x3d& a, int snapshotNo) {
     ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).aMat[localIndex_] = a;
-    ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).unitVector[localIndex_] = a.inverse() * sU_.getColum(2);    
+    ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).unitVector[localIndex_] = a.inverse() * sU_.getColumn(2);    
 
     std::vector<Atom*>::iterator i;
     for (i = atoms_.begin(); i != atoms_.end(); ++i) {
@@ -221,7 +221,7 @@ void  RigidBody::calcRefCoords() {
   if (n_linear_coords > 1) {
           sprintf( painCave.errMsg,
                "RigidBody error.\n"
-               "\tOOPSE found more than one axis in this rigid body with a vanishing \n"
+               "\tOpenMD found more than one axis in this rigid body with a vanishing \n"
                "\tmoment of inertia.  This can happen in one of three ways:\n"
                "\t 1) Only one atom was specified, or \n"
                "\t 2) All atoms were specified at the same location, or\n"