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

Comparing trunk/src/applications/hydrodynamics/ApproximationModel.hpp (file contents):
Revision 921 by tim, Wed Mar 29 18:09:26 2006 UTC vs.
Revision 972 by gezelter, Wed May 24 18:31:12 2006 UTC

# Line 50 | Line 50 | namespace oopse {
50   #include "applications/hydrodynamics/HydrodynamicsModel.hpp"
51   namespace oopse {
52  
53 < class Shape;
54 < class ApproximationModel :  public HydrodynamicsModel {
55 <    public:
56 <        ApproximationModel(StuntDouble* sd, SimInfo* info);
57 <
58 <        virtual bool calcHydroProps(Spheric* spheric, double viscosity, double temperature);
59 <        virtual bool calcHydroProps(Ellipsoid* ellipsoid, double viscosity, double temperature);
60 <        virtual bool calcHydroProps(CompositeShape* compositexShape, double viscosity, double temperature);
61 <        virtual void init();
62 <        virtual void writeBeads(std::ostream& os);
63 <    private:
64 <        bool internalCalcHydroProps(Shape* shape, double viscosity, double temperature);
65 <
66 <        
67 <        virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
68 <
69 <        bool calcHydroPropsAtCR(std::vector<BeadParam>& beads, double viscosity, double temperature, HydroProps& cr);
70 <        bool calcHydroPropsAtCD(std::vector<BeadParam>& beads, double viscosity, double temperature, HydroProps& cd);
71 <        std::vector<BeadParam> beads_;
53 >  class Shape;
54 >  class ApproximationModel :  public HydrodynamicsModel {
55 >  public:
56 >    ApproximationModel(StuntDouble* sd, SimInfo* info);
57 >    
58 >    virtual bool calcHydroProps(Shape* shape, RealType viscosity, RealType temperature);
59 >    virtual void init();
60 >    virtual void writeBeads(std::ostream& os);
61 >  private:
62 >    virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
63 >    
64 >    bool calcHydroPropsAtCR(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProps& cr);
65 >    bool calcHydroPropsAtCD(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProps& cd);
66 >    std::vector<BeadParam> beads_;
67   };
68 +  
69  
74 –
70   }
71  
72   #endif

Diff Legend

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