--- trunk/test/brains/DirectionalAtom.cpp 2004/11/01 19:57:07 197 +++ trunk/test/brains/DirectionalAtom.cpp 2009/11/25 20:02:06 1390 @@ -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/DirectionalAtom.hpp" -namespace oopse { +namespace OpenMD { DirectionalAtom::DirectionalAtom(DirectionalAtomType* dAtomType) : Atom(dAtomType){ @@ -38,18 +38,18 @@ void DirectionalAtom::setPrevA(const RotMat3x3d& a) { void DirectionalAtom::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); } void DirectionalAtom::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); } void DirectionalAtom::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); } void DirectionalAtom::rotateBy(const RotMat3x3d& m) {