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

Comparing trunk/src/lattice/shapedLattice.hpp (file contents):
Revision 905 by chuckv, Fri Mar 17 16:11:30 2006 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 42 | Line 42
42   *
43   *  Created by Charles F. Vardeman II on 17 Feb 2006.
44   *  @author  Charles F. Vardeman II
45 < *  @version $Id: shapedLattice.hpp,v 1.1 2006-03-17 16:10:19 chuckv Exp $
45 > *  @version $Id: shapedLattice.hpp,v 1.4 2006-05-17 21:51:42 tim Exp $
46   *
47   */
48  
49 < #ifndef NANOPARTICLEBUILDER_SHAPEDLATTICE_HPP
50 < #define NANOPARTICLEBUILDER_SHAPEDLATTICE_HPP
49 > #ifndef LATTICE_SHAPEDLATTICE_HPP
50 > #define LATTICE_SHAPEDLATTICE_HPP
51  
52   #include "math/Vector3.hpp"
53   #include "lattice/LatticeFactory.hpp"
# Line 63 | Line 63 | namespace oopse{
63    
64    class shapedLattice{
65    public:
66 <    shapedLattice(double latticeConstant,std::string latticeType);
67 <    ~shapedLattice(){};
66 >    shapedLattice(RealType latticeConstant,std::string latticeType);
67 >    virtual ~shapedLattice(){};
68      /**
69        * setGridDimension:  
70       *
71       */
72      void setGridDimension(Vector3d dimension);
73    void setGridDimension(Vector3d dimension, Vector3d origin);
73          virtual bool isInterior(Vector3d point) =0;
74          std::vector<Vector3d> getPoints();
75 <  private:
75 >        std::vector<Vector3d> getPointsOrt(){ return coordsOrt_;}
76 > protected:
77 > Vector3d dimension_;
78 > //Vector3d origin_;  
79 > private:
80      std::vector<Vector3d> coords_;
81 +    std::vector<Vector3d> coordsOrt_;
82      Lattice *simpleLattice_;
83 <    double latticeConstant_;
83 >    RealType latticeConstant_;
84      std::string latticeType_;
81    Vector3d dimension_;
82    Vector3d origin_;
85      int beginNx_;
86      int beginNy_;
87      int beginNz_;
# Line 89 | Line 91 | namespace oopse{
91      
92    };
93   }
94 < #endif /* NANOPARTICLEBUILDER_SHAPEDLATTICE_HPP */
94 > #endif /* LATTICE_SHAPEDLATTICE_HPP */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines