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:
trunk/OOPSE-2.0/src/applications/simpleBuilder/Lattice.hpp (file contents), Revision 1501 by tim, Tue Sep 28 23:24:25 2004 UTC vs.
branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/Lattice.hpp (file contents), Revision 1891 by tim, Wed Dec 15 22:34:41 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  
7 < const string FCCLatticeType = "FCC";
9 < const string BCCLatticeType = "BCC";
10 < const string HCPCLatticeType = "HCP";
11 < const string OrthorhombicLatticeType = "ORTHORHOMBIC";
7 > namespace oopse {
8  
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{
16    protected:
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 string getLatticeType() {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 string getLatticeType() {return BCCLatticeType;}
41 < };
42 <
43 <
44 < class HCPLattice : public BaseLattice{
45 <  public:
46 <    HCPLattice();
47 <    virtual const string getLatticeType() {return HCPCLatticeType;}
48 < };
49 <
50 < class OrthorhombicLattice : public BaseLattice{
51 <  public:
52 <    OrthorhombicLattice();
53 <    virtual const string getLatticeType() {return OrthorhombicLatticeType;}
54 < };
55 < */
56 <
57 <
37 > }
38   #endif

Diff Legend

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