--- trunk/src/applications/hydrodynamics/AnalyticalModel.cpp 2006/03/20 19:12:14 908 +++ trunk/src/applications/hydrodynamics/AnalyticalModel.cpp 2006/03/23 15:03:33 915 @@ -92,7 +92,7 @@ bool AnalyticalModel::calcHydroProps(Ellipsoid* ellips double S; if (p > 1.0) { //prolate S = 2.0/sqrt(a2 - b2) * log((a + sqrt(a2-b2))/b); - } { //oblate + } else { //oblate S = 2.0/sqrt(b2 - a2) * atan(sqrt(b2-a2)/a); } @@ -133,6 +133,12 @@ bool AnalyticalModel::calcHydroProps(CompositeShape* c return false; } +void AnalyticalModel::writeBeads(std::ostream& os) { + os << "1\n"; + os << "Generated by Hydro\n"; + Vector3d pos = sd_->getPos(); + os << sd_->getType() << "\t" << pos[0] << "\t" << pos[1] << "\t" << pos[2] << std::endl; +} }