--- trunk/src/hydrodynamics/Sphere.cpp	2006/05/16 02:06:37	956
+++ trunk/src/hydrodynamics/Sphere.cpp	2006/06/05 18:24:45	981
@@ -45,7 +45,7 @@ namespace oopse {
 
 namespace oopse {
   
-  Sphere::Sphere(Vector3d origin, double radius) : origin_(origin), radius_(radius){
+  Sphere::Sphere(Vector3d origin, RealType radius) : origin_(origin), radius_(radius){
     
   }
   
@@ -69,27 +69,32 @@ namespace oopse {
     return boundary;
   }
   
-  HydroProps Sphere::getHydroProps(double viscosity, double temperature) {
-    HydroProps props;
-    props.center =V3Zero;
-    double Xitt  = 6.0 * NumericConstant::PI * viscosity * radius_;
-    double Xirr = 8.0 * NumericConstant::PI * viscosity * radius_ * radius_ * radius_;
-    props.Xi(0, 0) = Xitt;
-    props.Xi(1, 1) = Xitt;
-    props.Xi(2, 2) = Xitt;
-    props.Xi(3, 3) = Xirr;
-    props.Xi(4, 4) = Xirr;
-    props.Xi(5, 5) = Xirr;
+  HydroProp* Sphere::getHydroProp(RealType viscosity, RealType temperature) {
     
-    const double convertConstant = 6.023; //convert poise.angstrom to amu/fs
-    props.Xi *= convertConstant;
-    Mat6x6d XiCopy = props.Xi;
-    invertMatrix(XiCopy, props.D);
-    double kt = OOPSEConstant::kB * temperature;
-    props.D *= kt;
-    props.Xi *= OOPSEConstant::kb * temperature;
+    RealType Xitt  = 6.0 * NumericConstant::PI * viscosity * radius_;
+    RealType Xirr = 8.0 * NumericConstant::PI * viscosity * radius_ * radius_ * radius_;
+
+    Mat6x6d Xi, XiCopy, D;
+
+    Xi(0, 0) = Xitt;
+    Xi(1, 1) = Xitt;
+    Xi(2, 2) = Xitt;
+    Xi(3, 3) = Xirr;
+    Xi(4, 4) = Xirr;
+    Xi(5, 5) = Xirr;
     
-    return props;
+    const RealType convertConstant = 6.023; //convert poise.angstrom to amu/fs
+    Xi *= convertConstant;
+    XiCopy = Xi;
+
+    invertMatrix(XiCopy, D);
+    RealType kt = OOPSEConstant::kB * temperature;
+    D *= kt;
+    Xi *= OOPSEConstant::kb * temperature;
+
+    HydroProp* hprop = new HydroProp(V3Zero, Xi, D);
+    
+    return hprop;
   }
   
 }