--- branches/development/src/lattice/shapedLattice.cpp 2010/07/09 23:08:25 1465 +++ branches/development/src/lattice/shapedLattice.cpp 2013/05/17 14:41:42 1875 @@ -34,13 +34,14 @@ * * [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] Vardeman & Gezelter, in progress (2009). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [4] Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). * * - * * sphericalLattice.cpp * * Created by Charles F. Vardeman II on 17 Feb 2006. + * Edited by Kelsey M. Stocker on 23 Feb 2012. * @author Charles F. Vardeman II * @version $Id$ * @@ -52,11 +53,11 @@ #include "brains/Register.hpp" #include "lattice/LatticeFactory.hpp" +using namespace std; namespace OpenMD{ - shapedLattice::shapedLattice(RealType latticeConstant, - std::string latticeType) { - latticeConstant_ = latticeConstant; - latticeType_ = latticeType; + shapedLattice::shapedLattice(RealType latticeConstant, string latticeType) + : latticeConstant_(latticeConstant), latticeType_(latticeType) { + registerLattice(); simpleLattice_ = LatticeFactory::getInstance()->createLattice(latticeType); if (simpleLattice_ == NULL){ @@ -80,6 +81,8 @@ namespace OpenMD{ endNx_ = (int) ceil(0.5*dimension_[0]/latticeConstant_); endNy_ = (int) ceil(0.5*dimension_[1]/latticeConstant_); endNz_ = (int) ceil(0.5*dimension_[2]/latticeConstant_); + std::cerr << "begin = " << beginNx_ << " " << beginNy_ << " " << beginNz_ << "\n"; + std::cerr << "end = " << endNx_ << " " << endNy_ << " " << endNz_ << "\n"; sitesComputed_ = false; }