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 1683, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1826 by tim, Thu Dec 2 05:04:20 2004 UTC

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

Diff Legend

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