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 2773 by tim, Thu May 25 16:27:27 2006 UTC vs.
Revision 2787 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"
51  
52   namespace oopse {
53    
# Line 73 | Line 72 | namespace oopse {
72      virtual void init() {};
73      virtual void writeBeads(std::ostream& os) = 0;
74      void writeHydroProps(std::ostream& os);
75 <    HydroProps getHydroPropsAtCR() {return cr_;}
76 <    HydroProps getHydroPropsAtCD() {return cd_;}
75 >    HydroProp* getHydroPropsAtCR() {return cr_;}
76 >    HydroProp* getHydroPropsAtCD() {return cd_;}
77      
78 <    void setCR(const HydroProps cr) {cr_ = cr;}
79 <    void setCD(const HydroProps cd) { cd_ = cd;}
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 <    HydroProps cr_;
86 <    HydroProps cd_;
85 >    HydroProp* cr_;
86 >    HydroProp* cd_;
87      std::vector<BeadParam> beads_;
88    };
89    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines