--- trunk/test/brains/StuntDouble.cpp 2004/10/23 23:09:46 147 +++ trunk/test/brains/StuntDouble.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 @@ -32,9 +32,10 @@ #include "primitives/StuntDouble.hpp" -namespace oopse { +namespace OpenMD { -StuntDouble::StuntDouble() : +StuntDouble::StuntDouble(ObjectType objType, DataStoragePointer storage) : + objType_(objType), storage_(storage), linear_(false), linearAxis_(-1), globalIndex_(-1), localIndex_(-1), snapshotMan_(NULL){ } @@ -42,28 +43,31 @@ StuntDouble::~StuntDouble() { } +void StuntDouble::zeroForces() { + setFrc(V3Zero); +} void StuntDouble::addProperty(GenericData* genData) { - properties.addProperty(genData); + properties_.addProperty(genData); } void StuntDouble::removeProperty(std::string& propName) { - properties.removeProperty(); + properties_.removeProperty(propName); } void StuntDouble::clearProperties() { - properties.clearProperties(); + properties_.clearProperties(); } std::vector StuntDouble::getPropertyNames() { - return properties.getPropertyNames(); + return properties_.getPropertyNames(); } std::vector StuntDouble::getProperties() { - return properties.getProperties(); + return properties_.getProperties(); } -GenericData* StuntDouble::getPropertyByName(std:string& propName) { - return properties.getPropertyByName(propName); +GenericData* StuntDouble::getPropertyByName(std::string& propName) { + return properties_.getPropertyByName(propName); }