ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/lattice/shapedLattice.cpp
(Generate patch)

Comparing branches/development/src/lattice/shapedLattice.cpp (file contents):
Revision 1701 by kstocke1, Thu Apr 5 19:37:58 2012 UTC vs.
Revision 1875 by gezelter, Fri May 17 14:41:42 2013 UTC

# Line 34 | Line 34
34   *                                                                      
35   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
36   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
37 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
37 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
38   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
39   * [4]  Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). *
40   *
# Line 53 | Line 53
53   #include "brains/Register.hpp"
54   #include "lattice/LatticeFactory.hpp"
55  
56 + using namespace std;
57   namespace OpenMD{
58 <  shapedLattice::shapedLattice(RealType latticeConstant,
59 <                               std::string latticeType) {
60 <    latticeConstant_ = latticeConstant;
60 <    latticeType_ = latticeType;
58 >  shapedLattice::shapedLattice(RealType latticeConstant, string latticeType)
59 >  : latticeConstant_(latticeConstant), latticeType_(latticeType) {
60 >
61      registerLattice();
62      simpleLattice_ = LatticeFactory::getInstance()->createLattice(latticeType);
63      if (simpleLattice_ == NULL){

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines