ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/lattice/shapedLattice.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/lattice/shapedLattice.hpp (file contents):
Revision 2677 by chuckv, Wed Mar 29 19:17:20 2006 UTC vs.
Revision 3050 by gezelter, Tue Oct 17 15:24:29 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.3 2006-03-29 19:17:20 chuckv Exp $
45 > *  @version $Id: shapedLattice.hpp,v 1.6 2006-10-17 15:24:29 gezelter Exp $
46   *
47   */
48  
# Line 63 | Line 63 | namespace oopse{
63    
64    class shapedLattice{
65    public:
66 <    shapedLattice(double latticeConstant,std::string latticeType);
66 >    shapedLattice(RealType latticeConstant, std::string latticeType);
67      virtual ~shapedLattice(){};
68      /**
69 <      * setGridDimension:  
69 >     * setGridDimension:  
70       *
71       */
72      void setGridDimension(Vector3d dimension);
73 <        virtual bool isInterior(Vector3d point) =0;
74 <        std::vector<Vector3d> getPoints();
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_;
73 >    void setOrigin(Vector3d origin);
74 >    virtual bool isInterior(Vector3d point) =0;
75 >    std::vector<Vector3d> getSites();
76 >    std::vector<Vector3d> getOrientations();
77 >  protected:
78 >    void findSites();
79 >    Vector3d dimension_;
80 >    Vector3d origin_;  
81 >  private:
82 >    bool sitesComputed_;
83 >    std::vector<Vector3d> sites_;
84 >    std::vector<Vector3d> orientations_;
85      Lattice *simpleLattice_;
86 <    double latticeConstant_;
86 >    RealType latticeConstant_;
87      std::string latticeType_;
88      int beginNx_;
89      int beginNy_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines