--- trunk/src/applications/hydrodynamics/Hydro.cpp	2006/04/25 02:09:01	945
+++ trunk/src/applications/hydrodynamics/Hydro.cpp	2006/08/30 21:13:57	1027
@@ -64,6 +64,7 @@ void registerHydrodynamicsModels();
     Shape* shape;
 };
 void registerHydrodynamicsModels();
+void writeHydroProps(std::ostream& os);
 
 int main(int argc, char* argv[]){
   //register force fields
@@ -88,19 +89,16 @@ int main(int argc, char* argv[]){
     exit(1);
   }
   
-  mdFileName = dumpFileName;
-  mdFileName = mdFileName.substr(0, mdFileName.rfind(".")) + ".md";
-
   if (args_info.output_given){
     prefix = args_info.output_arg;
   } else {
-    prefix = getPrefix(mdFileName);    
+    prefix = getPrefix(dumpFileName);    
   }
   std::string outputFilename = prefix + ".diff";
     
   //parse md file and set up the system
   SimCreator creator;
-  SimInfo* info = creator.createSim(mdFileName, true);
+  SimInfo* info = creator.createSim(dumpFileName, true);
     
   SimInfo::MoleculeIterator mi;
   Molecule* mol;
@@ -112,8 +110,8 @@ int main(int argc, char* argv[]){
   identMat(2,2) = 1.0;
 
   Globals* simParams = info->getSimParams();
-  double temperature;
-  double viscosity;
+  RealType temperature;
+  RealType viscosity;
 
   if (simParams->haveViscosity()) {
     viscosity = simParams->getViscosity();
@@ -181,10 +179,10 @@ int main(int argc, char* argv[]){
 
         //if beads option is turned on, skip the calculation
         if (!args_info.beads_flag) {
-            shape->calcHydroProps(model, viscosity, temperature);
-            model->writeHydroProps(outputDiff);
+          model->calcHydroProps(shape, viscosity, temperature);
+          model->writeHydroProps(outputDiff);
         }
-
+        
         delete model;
   }
 
@@ -200,4 +198,3 @@ void registerHydrodynamicsModels() {
     HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<AnalyticalModel>("AnalyticalModel"));
 
 }
-