--- trunk/src/applications/hydrodynamics/AnalyticalModel.cpp	2006/03/20 19:12:14	908
+++ trunk/src/applications/hydrodynamics/AnalyticalModel.cpp	2006/05/16 02:06:37	956
@@ -38,15 +38,16 @@
  * University of Notre Dame has been advised of the possibility of
  * such damages.
  */
-#include "applications/hydrodynamics/AnalyticalModel.hpp"
-#include "applications/hydrodynamics/Spheric.hpp"
-#include "applications/hydrodynamics/Ellipsoid.hpp"
-#include "applications/hydrodynamics/CompositeShape.hpp"
+#include "hydrodynamics/AnalyticalModel.hpp"
+#include "hydrodynamics/Sphere.hpp"
+#include "hydrodynamics/Ellipsoid.hpp"
+#include "hydrodynamics/CompositeShape.hpp"
 #include "math/LU.hpp"
 namespace oopse {
-bool AnalyticalModel::calcHydroProps(Spheric* spheric, double viscosity, double temperature) {
-
-    double radius = spheric->getRadius(); 
+  
+  bool AnalyticalModel::calcHydroProps(Sphere* sphere, double viscosity, double temperature) {
+    
+    double radius = sphere->getRadius(); 
     HydroProps props;
     props.center =V3Zero;
     double Xitt  = 6.0 * NumericConstant::PI * viscosity * radius;
@@ -65,24 +66,23 @@ bool AnalyticalModel::calcHydroProps(Spheric* spheric,
     double kt = OOPSEConstant::kB * temperature;
     props.D *= kt;
     props.Xi *= OOPSEConstant::kb * temperature;
-
+    
     setCR(props);
     setCD(props);
-
-    return true;
     
+    return true;    
 }
 
-/**
- * Reference:
- * (2) F. Perrin , J. Phys. Radium, [7] 5, 497-511, 1934
- * (3) F. Perrin, J. Phys. Radium, [7] 7, 1-11, 1936
- */        
-bool AnalyticalModel::calcHydroProps(Ellipsoid* ellipsoid, double viscosity, double temperature) {
-
+  /**
+   * Reference:
+   * (2) F. Perrin , J. Phys. Radium, [7] 5, 497-511, 1934
+   * (3) F. Perrin, J. Phys. Radium, [7] 7, 1-11, 1936
+   */        
+  bool AnalyticalModel::calcHydroProps(Ellipsoid* ellipsoid, double viscosity, double temperature) {
+    
     double rMajor = ellipsoid->getRMajor();
     double rMinor = ellipsoid->getRMinor();
-
+    
     double a = rMinor;
     double b = rMajor;
     double a2 = a * a;
@@ -91,22 +91,22 @@ bool AnalyticalModel::calcHydroProps(Ellipsoid* ellips
     double p = a /b;
     double S;
     if (p > 1.0) { //prolate
-        S = 2.0/sqrt(a2 - b2) * log((a + sqrt(a2-b2))/b);
-    } { //oblate
-        S = 2.0/sqrt(b2 - a2) * atan(sqrt(b2-a2)/a);
+      S = 2.0/sqrt(a2 - b2) * log((a + sqrt(a2-b2))/b);
+    } else { //oblate
+      S = 2.0/sqrt(b2 - a2) * atan(sqrt(b2-a2)/a);
     }
-
+    
     double P = 1.0/(a2 - b2) * (S - 2.0/a);
     double Q = 0.5/(a2-b2) * (2.0*a/b2 - S);
-
+    
     double transMinor = 16.0 * NumericConstant::PI * viscosity * (a2 - b2) /((2.0*a2-b2)*S -2.0*a);
     double transMajor = 32.0 * NumericConstant::PI * viscosity * (a2 - b2) /((2.0*a2-3.0*b2)*S +2.0*a);
     double rotMinor = 32.0/3.0 * NumericConstant::PI * viscosity *(a2 - b2) * b2 /(2.0*a -b2*S);
     double rotMajor = 32.0/3.0 * NumericConstant::PI * viscosity *(a2*a2 - b2*b2)/((2.0*a2-b2)*S-2.0*a);
     
-        
+    
     HydroProps props;
-
+    
     props.Xi(0,0) = transMajor;
     props.Xi(1,1) = transMajor;
     props.Xi(2,2) = transMinor;
@@ -125,14 +125,18 @@ bool AnalyticalModel::calcHydroProps(Ellipsoid* ellips
     
     setCR(props);
     setCD(props);
-
+    
     return true;
-}
-
-bool AnalyticalModel::calcHydroProps(CompositeShape* compositexShape, double viscosity, double temperature) {
+  }
+  
+  bool AnalyticalModel::calcHydroProps(CompositeShape* compositeShape, double viscosity, double temperature) {
     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;
+  }   
 }
-        
-
-
-}