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 2633 by chuckv, Fri Mar 17 16:11:30 2006 UTC vs.
Revision 3046 by gezelter, Sat Oct 14 20:21:26 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.5 2006-10-14 20:21:26 gezelter 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:  
69 >     * setGridDimension:  
70       *
71       */
72      void setGridDimension(Vector3d dimension);
73 <    void setGridDimension(Vector3d dimension, Vector3d origin);
74 <        virtual bool isInterior(Vector3d point) =0;
75 <        std::vector<Vector3d> getPoints();
73 >    virtual bool isInterior(Vector3d point) =0;
74 >    std::vector<Vector3d> getSites();
75 >    std::vector<Vector3d> getOrientations();
76 >  protected:
77 >    void findSites();
78 >    Vector3d dimension_;
79 >    //Vector3d origin_;  
80    private:
81 <    std::vector<Vector3d> coords_;
81 >    bool sitesComputed_;
82 >    std::vector<Vector3d> sites_;
83 >    std::vector<Vector3d> orientations_;
84      Lattice *simpleLattice_;
85 <    double latticeConstant_;
85 >    RealType latticeConstant_;
86      std::string latticeType_;
81    Vector3d dimension_;
82    Vector3d origin_;
87      int beginNx_;
88      int beginNy_;
89      int beginNz_;
# Line 89 | Line 93 | namespace oopse{
93      
94    };
95   }
96 < #endif /* NANOPARTICLEBUILDER_SHAPEDLATTICE_HPP */
96 > #endif /* LATTICE_SHAPEDLATTICE_HPP */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines