--- trunk/src/applications/hydrodynamics/AnalyticalModel.cpp	2006/05/24 18:31:12	972
+++ trunk/src/applications/hydrodynamics/AnalyticalModel.cpp	2008/01/16 20:19:28	1208
@@ -47,23 +47,27 @@ namespace oopse {
   
   bool AnalyticalModel::calcHydroProps(Shape* shape, RealType viscosity, RealType temperature) {
     
-    HydroProps props;
+    HydroProp* props;
     Sphere* sphere = dynamic_cast<Sphere*>(shape);        
     if (sphere != NULL) {
-      props = sphere->getHydroProps(viscosity, temperature);
+      props = sphere->getHydroProp(viscosity, temperature);
       setCR(props);
       setCD(props);
       return true;
     } else {
       Ellipsoid* ellipsoid = dynamic_cast<Ellipsoid*>(shape);        
       if (ellipsoid != NULL) {
-        props = ellipsoid->getHydroProps(viscosity, temperature); 
+        props = ellipsoid->getHydroProp(viscosity, temperature); 
         setCR(props);
         setCD(props);
         return true;
       } else {
         CompositeShape* composite = dynamic_cast<CompositeShape*>(shape);
         if (composite != NULL) {
+//           props = composite->getHydroProp(viscosity, temperature); 
+//           setCR(props);
+//           setCD(props);
+//           return true;
           return false;
         } else {
           sprintf( painCave.errMsg,