| 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 |
| 97 |
|
} |
| 98 |
|
private: |
| 99 |
|
|
| 100 |
< |
int isValidGrid(unsigned int i, unsigned int j, unsigned int k) { |
| 100 |
> |
int isValidGrid(unsigned int i, unsigned int j, unsigned int k) const { |
| 101 |
|
int index = i * dim2_*dim3_ + j * dim3_ + k; |
| 102 |
|
return index < data_.size() ? index : -1; |
| 103 |
|
}; |
| 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 |
|
} |
