| # | Line 92 | Line 92 | bool AnalyticalModel::calcHydroProps(Ellipsoid* ellips | |
|---|---|---|
| 92 | double S; | |
| 93 | if (p > 1.0) { //prolate | |
| 94 | S = 2.0/sqrt(a2 - b2) * log((a + sqrt(a2-b2))/b); | |
| 95 | < | } { //oblate |
| 95 | > | } else { //oblate |
| 96 | S = 2.0/sqrt(b2 - a2) * atan(sqrt(b2-a2)/a); | |
| 97 | } | |
| 98 | ||
| # | Line 133 | Line 133 | bool AnalyticalModel::calcHydroProps(CompositeShape* c | |
| 133 | return false; | |
| 134 | } | |
| 135 | ||
| 136 | + | void AnalyticalModel::writeBeads(std::ostream& os) { |
| 137 | + | os << "1\n"; |
| 138 | + | os << "Generated by Hydro\n"; |
| 139 | + | Vector3d pos = sd_->getPos(); |
| 140 | + | os << sd_->getType() << "\t" << pos[0] << "\t" << pos[1] << "\t" << pos[2] << std::endl; |
| 141 | + | } |
| 142 | ||
| 143 | ||
| 144 | } | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |