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

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/HydrodynamicsModel.hpp (file contents):
Revision 2675 by tim, Wed Mar 29 18:09:26 2006 UTC vs.
Revision 2768 by gezelter, Wed May 24 18:31:12 2006 UTC

# Line 49 | Line 49 | namespace oopse {
49   #include "utils/HydroProps.hpp"
50   #include "utils/OOPSEConstant.hpp"
51   #include "utils/HydroProps.hpp"
52 – namespace oopse {
52  
53 < struct BeadParam {
53 > namespace oopse {
54 >  
55 >  struct BeadParam {
56      std::string atomName;
57      Vector3d pos;
58      double radius;
59 < };
59 >  };
60 >  
61 >  class Shape;
62 >  class Sphere;
63 >  class Ellipsoid;
64 >  class CompositeShape;
65 >  
66 >  class HydrodynamicsModel {
67 >  public:
68 >    HydrodynamicsModel(StuntDouble* sd, SimInfo* info) : sd_(sd), info_(info) {}
69 >    virtual ~HydrodynamicsModel() {}
70  
71 < class Spheric;
72 < class Ellipsoid;
73 < class CompositeShape;
74 <
75 < class HydrodynamicsModel {
76 <    public:
77 <        HydrodynamicsModel(StuntDouble* sd, SimInfo* info) : sd_(sd), info_(info) {}
78 <        virtual ~HydrodynamicsModel() {}
79 <        virtual bool calcHydroProps(Spheric* spheric, double viscosity, double temperature);
80 <        virtual bool calcHydroProps(Ellipsoid* ellipsoid, double viscosity, double temperature);
81 <        virtual bool calcHydroProps(CompositeShape* compositexShape, double viscosity, double temperature);
82 <
83 <        virtual void init() {};
84 <        virtual void writeBeads(std::ostream& os) = 0;
85 <        void writeHydroProps(std::ostream& os);
86 <        HydroProps getHydroPropsAtCR() {return cr_;}
87 <        HydroProps getHydroPropsAtCD() {return cd_;}
88 <        
89 <        void setCR(const HydroProps cr) {cr_ = cr;}
90 <        void setCD(const HydroProps cd) { cd_ = cd;}
80 <        std::string getStuntDoubleName() { return sd_->getType();}
81 <    protected:
82 <        StuntDouble* sd_;
83 <        SimInfo* info_;
84 <    private:
85 <        HydroProps cr_;
86 <        HydroProps cd_;
87 <        std::vector<BeadParam> beads_;
88 < };
89 <
71 >    virtual bool calcHydroProps(Shape* shape, RealType viscosity, RealType temperature);
72 >    
73 >    virtual void init() {};
74 >    virtual void writeBeads(std::ostream& os) = 0;
75 >    void writeHydroProps(std::ostream& os);
76 >    HydroProps getHydroPropsAtCR() {return cr_;}
77 >    HydroProps getHydroPropsAtCD() {return cd_;}
78 >    
79 >    void setCR(const HydroProps cr) {cr_ = cr;}
80 >    void setCD(const HydroProps cd) { cd_ = cd;}
81 >    std::string getStuntDoubleName() { return sd_->getType();}
82 >  protected:
83 >    StuntDouble* sd_;
84 >    SimInfo* info_;
85 >  private:
86 >    HydroProps cr_;
87 >    HydroProps cd_;
88 >    std::vector<BeadParam> beads_;
89 >  };
90 >  
91   }
92  
93   #endif

Diff Legend

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