| 47 |
|
|
| 48 |
|
bool AnalyticalModel::calcHydroProps(Shape* shape, RealType viscosity, RealType temperature) { |
| 49 |
|
|
| 50 |
< |
HydroProps props; |
| 50 |
> |
HydroProp* props; |
| 51 |
|
Sphere* sphere = dynamic_cast<Sphere*>(shape); |
| 52 |
|
if (sphere != NULL) { |
| 53 |
< |
props = sphere->getHydroProps(viscosity, temperature); |
| 53 |
> |
props = sphere->getHydroProp(viscosity, temperature); |
| 54 |
|
setCR(props); |
| 55 |
|
setCD(props); |
| 56 |
|
return true; |
| 57 |
|
} else { |
| 58 |
|
Ellipsoid* ellipsoid = dynamic_cast<Ellipsoid*>(shape); |
| 59 |
|
if (ellipsoid != NULL) { |
| 60 |
< |
props = ellipsoid->getHydroProps(viscosity, temperature); |
| 60 |
> |
props = ellipsoid->getHydroProp(viscosity, temperature); |
| 61 |
|
setCR(props); |
| 62 |
|
setCD(props); |
| 63 |
|
return true; |
| 64 |
|
} else { |
| 65 |
|
CompositeShape* composite = dynamic_cast<CompositeShape*>(shape); |
| 66 |
|
if (composite != NULL) { |
| 67 |
+ |
// props = composite->getHydroProp(viscosity, temperature); |
| 68 |
+ |
// setCR(props); |
| 69 |
+ |
// setCD(props); |
| 70 |
+ |
// return true; |
| 71 |
|
return false; |
| 72 |
|
} else { |
| 73 |
|
sprintf( painCave.errMsg, |