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

Comparing trunk/src/applications/hydrodynamics/HydrodynamicsModel.hpp (file contents):
Revision 921 by tim, Wed Mar 29 18:09:26 2006 UTC vs.
Revision 981 by gezelter, Mon Jun 5 18:24:45 2006 UTC

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

Diff Legend

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