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

Comparing trunk/src/lattice/Lattice.hpp (file contents):
Revision 482 by gezelter, Tue Apr 12 21:27:33 2005 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 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, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42 < #ifndef LATTICE_LATTICE_HPP
43 < #define LATTICE_LATTICE_HPP
44 < #include "lattice/BaseLattice.hpp"
45 < #include <string>
42 > #ifndef LATTICE_BASELATTICE_HPP
43 > #define LATTICE_BASELATTICE_HPP
44 >
45   #include <vector>
46 + #include "math/Vector3.hpp"
47  
48 < namespace oopse {
48 > namespace OpenMD {
49  
50 < const  std::string FCCLatticeType = "FCC";
51 < const  std::string BCCLatticeType = "BCC";
52 < const  std::string HCPCLatticeType = "HCP";
53 < const  std::string OrthorhombicLatticeType = "ORTHORHOMBIC";
54 <
55 <
56 < class CubicLattice : public BaseLattice{
50 >  class Lattice{
51    protected:
52 <    CubicLattice();
52 >    Lattice(){
53 >      
54 >      setOrigin(V3Zero);
55 >    }
56 >    
57    public:
58 +
59 +    //virtual destructor of Lattice
60 +    virtual ~Lattice() {}
61 +    
62 +    int getNumSitesPerCell() {return nCellSites;}
63 +
64 +    void getLatticePointsPos(std::vector<Vector3d>& latticePos, int nx, int ny, int nz);
65 +
66 +    std::vector<Vector3d> getLatticePointsOrt() {return cellSitesOrt;}
67 +    
68      //get lattice constant of unit cell
69 <    virtual  std::vector<double> getLatticeConstant();
69 >    virtual  std::vector<RealType> getLatticeConstant() =0;
70  
71      //set lattice constant of unit cell
72 <    virtual void setLatticeConstant(const  std::vector<double>& lc);
65 <  protected:
66 <    double latticeParam;
67 < };
72 >    virtual void setLatticeConstant(const  std::vector<RealType>& lc)=0;
73  
74 +    //get origin of unit cell
75 +    Vector3d getOrigin( ) {return origin;}
76  
77 < class FCCLattice : public CubicLattice{
78 <  public:
79 <    FCCLattice();
80 <    virtual const  std::string getLatticeType() {return FCCLatticeType;}    
81 <    virtual void update();
77 >    //set origin of unit cell
78 >    void setOrigin(const Vector3d& newOrigin){
79 >      this->origin = newOrigin;
80 >    }
81 >
82 >  protected:
83 >    virtual void update() =0;
84      
85 < };
85 >    int nCellSites;
86 >    Vector3d origin;    
87 >    std::vector<Vector3d> cellSitesPos;
88 >    std::vector<Vector3d> cellSitesOrt;
89 >    Vector3d cellLen;
90 >  };
91  
92 +
93   }
94 +
95   #endif

Comparing trunk/src/lattice/Lattice.hpp (property svn:keywords):
Revision 482 by gezelter, Tue Apr 12 21:27:33 2005 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines