--- trunk/src/lattice/shapedLattice.cpp	2006/10/17 15:24:29	1074
+++ branches/development/src/lattice/shapedLattice.cpp	2013/02/20 15:39:39	1850
@@ -5,19 +5,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.
@@ -37,22 +28,32 @@
  * University of Notre Dame has been advised of the possibility of
  * such damages.
  *
+ * 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, 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: shapedLattice.cpp,v 1.6 2006-10-17 15:24:29 gezelter Exp $
+ *  @version $Id$
  *
  */
 
-
+#include <cstdlib>
 #include "lattice/shapedLattice.hpp"
 #include "math/Vector3.hpp"
 #include "brains/Register.hpp"
 #include "lattice/LatticeFactory.hpp"
 
-namespace oopse{
+namespace OpenMD{
   shapedLattice::shapedLattice(RealType latticeConstant, 
                                std::string latticeType) {
     latticeConstant_ = latticeConstant;
@@ -80,6 +81,8 @@ namespace oopse{
     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;  
   }