ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/Lattice.hpp
(Generate patch)

Comparing branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/Lattice.hpp (file contents):
Revision 1825 by tim, Thu Dec 2 04:55:10 2004 UTC vs.
Revision 1910 by tim, Fri Jan 7 21:50:13 2005 UTC

# Line 1 | Line 1
1 < #ifndef _LATTICE_H_
2 < #define _LATTICE_H_
1 > #ifndef APPLICATIONS_SIMPLEBUILDER_LATTICE_HPP
2 > #define APPLICATIONS_SIMPLEBUILDER_LATTICE_HPP
3   #include "applications/simpleBuilder/BaseLattice.hpp"
4   #include <string>
5   #include <vector>
6  
7 + namespace oopse {
8  
9 < const  std::stringFCCLatticeType = "FCC";
10 < const  std::stringBCCLatticeType = "BCC";
11 < const  std::stringHCPCLatticeType = "HCP";
12 < const  std::stringOrthorhombicLatticeType = "ORTHORHOMBIC";
9 > const  std::string FCCLatticeType = "FCC";
10 > const  std::string BCCLatticeType = "BCC";
11 > const  std::string HCPCLatticeType = "HCP";
12 > const  std::string OrthorhombicLatticeType = "ORTHORHOMBIC";
13  
14  
15   class CubicLattice : public BaseLattice{
# Line 16 | Line 17 | class CubicLattice : public BaseLattice{
17      CubicLattice();
18    public:
19      //get lattice constant of unit cell
20 <    virtual vector<double> getLatticeConstant();
20 >    virtual  std::vector<double> getLatticeConstant();
21  
22      //set lattice constant of unit cell
23 <    virtual void setLatticeConstant(const vector<double>& lc);
23 >    virtual void setLatticeConstant(const  std::vector<double>& lc);
24    protected:
25      double latticeParam;
26   };
# Line 28 | Line 29 | class FCCLattice : public CubicLattice{
29   class FCCLattice : public CubicLattice{
30    public:
31      FCCLattice();
32 <    virtual const  std::stringgetLatticeType() {return FCCLatticeType;}    
32 >    virtual const  std::string getLatticeType() {return FCCLatticeType;}    
33      virtual void update();
34      
35   };
36  
37 < /*
37 < class BCCLattice : public CubicLattice{
38 <  public:
39 <    BCCLattice();
40 <    virtual const  std::stringgetLatticeType() {return BCCLatticeType;}
41 < };
42 <
43 <
44 < class HCPLattice : public BaseLattice{
45 <  public:
46 <    HCPLattice();
47 <    virtual const  std::stringgetLatticeType() {return HCPCLatticeType;}
48 < };
49 <
50 < class OrthorhombicLattice : public BaseLattice{
51 <  public:
52 <    OrthorhombicLattice();
53 <    virtual const  std::stringgetLatticeType() {return OrthorhombicLatticeType;}
54 < };
55 < */
56 <
57 <
37 > }
38   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines