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

Comparing:
trunk/src/lattice/Lattice.hpp (file contents), Revision 486 by tim, Tue Apr 12 22:10:07 2005 UTC vs.
branches/development/src/lattice/Lattice.hpp (file contents), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef LATTICE_BASELATTICE_HPP
# Line 45 | Line 46
46   #include <vector>
47   #include "math/Vector3.hpp"
48  
49 < namespace oopse {
49 > namespace OpenMD {
50  
51 < class Lattice{
51 >  class Lattice{
52    protected:
53      Lattice(){
54        
# Line 63 | Line 64 | class Lattice{
64  
65      void getLatticePointsPos(std::vector<Vector3d>& latticePos, int nx, int ny, int nz);
66  
67 <     std::vector<Vector3d> getLatticePointsOrt() {return cellSitesOrt;}
67 >    std::vector<Vector3d> getLatticePointsOrt() {return cellSitesOrt;}
68      
69      //get lattice constant of unit cell
70 <    virtual  std::vector<double> getLatticeConstant() =0;
70 >    virtual  std::vector<RealType> getLatticeConstant() =0;
71  
72      //set lattice constant of unit cell
73 <    virtual void setLatticeConstant(const  std::vector<double>& lc)=0;
73 >    virtual void setLatticeConstant(const  std::vector<RealType>& lc)=0;
74  
75      //get origin of unit cell
76      Vector3d getOrigin( ) {return origin;}
# Line 84 | Line 85 | class Lattice{
85      
86      int nCellSites;
87      Vector3d origin;    
88 <     std::vector<Vector3d> cellSitesPos;
89 <     std::vector<Vector3d> cellSitesOrt;
88 >    std::vector<Vector3d> cellSitesPos;
89 >    std::vector<Vector3d> cellSitesOrt;
90      Vector3d cellLen;
91 < };
91 >  };
92  
93  
94   }

Comparing:
trunk/src/lattice/Lattice.hpp (property svn:keywords), Revision 486 by tim, Tue Apr 12 22:10:07 2005 UTC vs.
branches/development/src/lattice/Lattice.hpp (property svn:keywords), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines