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

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/RoughShell.hpp (file contents):
Revision 2631 by gezelter, Thu Mar 16 21:52:23 2006 UTC vs.
Revision 2634 by tim, Fri Mar 17 23:20:35 2006 UTC

# Line 41 | Line 41
41   #ifndef APPLICATION_HYDRODYNAMICS_ROUGHSHELL_HPP
42   #define APPLICATION_HYDRODYNAMICS_ROUGHSHELL_HPP
43  
44 < #include "applications/hydrodynamics/HydrodynamicsModel.hpp"
45 <
44 > #include "applications/hydrodynamics/ApproximationModel.hpp"
45 > #include "applications/hydrodynamics/CompositeShape.hpp"
46   namespace oopse {
47   /**
48   * @class Grid3d
# Line 110 | Line 110 | class RoughShell : public HydrodynamicsModel {
110   };
111      
112      
113 < class RoughShell : public HydrodynamicsModel {
113 > class RoughShell : public ApproximationModel {
114      public:
115 <        RoughShell(StuntDouble* sd, const DynamicProperty& extraParams);
115 >        RoughShell(StuntDouble* sd, SimInfo* info);
116 >        virtual ~RoughShell() { delete shape_;}
117 >        void setSigma(double sigma) {sigma_ = sigma;}
118 >        double getSigma() {return sigma_;}
119      private:
120          virtual bool createBeads(std::vector<BeadParam>& beads);
121 <        StuntDoubleShape sdShape_;
121 >        //StuntDoubleShape sdShape_;
122          double sigma_;
123 +        Shape* shape_;
124   };
125  
126   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines