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 2597 by tim, Thu Feb 23 23:16:43 2006 UTC vs.
Revision 2773 by tim, Thu May 25 16:27:27 2006 UTC

# Line 46 | Line 46
46   #include "math/SquareMatrix3.hpp"
47   #include "math/DynamicRectMatrix.hpp"
48   #include "primitives/Molecule.hpp"
49 < #include "applications/hydrodynamics/StuntDoubleShape.hpp"
50 < #include "utils/any.hpp"
51 < namespace oopse {
52 < struct HydrodynamicProps {
53 <    Vector3d diffCenter;
54 <    Mat3x3d transDiff;
55 <    Mat3x3d rotDiff;
56 <    Mat3x3d transRotDiff;
57 < };
49 > #include "utils/HydroProps.hpp"
50 > #include "utils/OOPSEConstant.hpp"
51 > #include "utils/HydroProps.hpp"
52  
53 < struct BeadParam {
53 > namespace oopse {
54 >  
55 >  struct BeadParam {
56      std::string atomName;
57      Vector3d pos;
58 <    double radius;
59 < };
58 >    RealType radius;
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 < typedef std::map<std::string, boost::any> DynamicProperty;
72 <
73 < class HydrodynamicsModel {
74 <    public:
75 <        HydrodynamicsModel(StuntDouble* sd, const DynamicProperty& extraParams);
76 <        bool calcHydrodyanmicsProps();
77 <
78 <        Vector3d getDiffCenter();
79 <        Mat3x3d getTransDiff();
80 <        Mat3x3d getRotDiff();
81 <        Mat3x3d getTransRotDiff();
82 <        void writeBeads(std::ostream& os);
83 <        void writeDiffCenterAndDiffTensor(std::ostream& os);
84 <    protected:
85 <        StuntDouble* sd_;
86 <    private:
87 <        virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
88 <
89 <
90 <        HydrodynamicProps props_;
85 <        std::vector<BeadParam> beads_;
86 <        double viscosity_;
87 <        double temperature_;
88 <        
89 < };
90 <
91 <
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