--- trunk/src/applications/staticProps/BondAngleDistribution.cpp 2007/09/17 20:05:51 1180 +++ trunk/src/applications/staticProps/BondAngleDistribution.cpp 2012/08/22 18:43:27 1785 @@ -6,19 +6,10 @@ * redistribute this software in source and binary code form, provided * that the following conditions are met: * - * 1. Acknowledgement of the program authors must be made in any - * publication of scientific results based in part on use of the - * program. An acceptable form of acknowledgement is citation of - * the article in which the program was described (Matthew - * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher - * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented - * Parallel Simulation Engine for Molecular Dynamics," - * J. Comput. Chem. 26, pp. 252-271 (2005)) - * - * 2. Redistributions of source code must retain the above copyright + * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 3. Redistributions in binary form must reproduce the above copyright + * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the * distribution. @@ -38,12 +29,18 @@ * University of Notre Dame has been advised of the possibility of * such damages. * - * BondAngleDistribution.cpp - * OOPSE-4 - * + * SUPPORT OPEN SCIENCE! If you use OpenMD or its source code in your + * research, please cite the appropriate papers when you publish your + * work. Good starting points are: + * + * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). + * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). * * Created by J. Daniel Gezelter on 07/27/07. * @author J. Daniel Gezelter - * @version $Id: BondAngleDistribution.cpp,v 1.1 2007-09-17 20:05:51 chuckv Exp $ + * @version $Id$ * */ @@ -53,7 +50,7 @@ #include "primitives/Molecule.hpp" #include "utils/NumericConstant.hpp" -namespace oopse { +namespace OpenMD { BondAngleDistribution::BondAngleDistribution(SimInfo* info, const std::string& filename, @@ -84,7 +81,7 @@ namespace oopse { histogram_.clear(); } - void BondAngleDistribution::initalizeHistogram() { + void BondAngleDistribution::initializeHistogram() { for (int bin = 0; bin < nBins_; bin++) { histogram_[bin] = 0; } @@ -102,14 +99,10 @@ namespace oopse { Vector3d vec; std::vector bondvec; std::vector bonddist; - RealType costheta; - RealType r; - RealType dist; + RealType r; + int nBonds; + int i; - int nBonds; - - int i, j; - DumpReader reader(info_, dumpFilename_); int nFrames = reader.getNFrames(); frameCounter_ = 0;