[ViewVC] Diff of: OpenMD/trunk/src/applications/hydrodynamics/Hydro.cpp

Comparing trunk/src/applications/hydrodynamics/Hydro.cpp (file contents):
Revision 921 by tim, Wed Mar 29 18:09:26 2006 UTC vs.
Revision 977 by tim, Thu May 25 16:27:27 2006 UTC

#	Line 64 \| Line 64 \| void registerHydrodynamicsModels();
64		Shape* shape;
65		};
66		void registerHydrodynamicsModels();
67	+	void writeHydroProps(std::ostream& os);
68
69		int main(int argc, char* argv[]){
70		//register force fields
#	Line 112 \| Line 113 \| *int main(int argc, char argv[]){**
113		identMat(2,2) = 1.0;
114
115		Globals* simParams = info->getSimParams();
116	<	double temperature;
117	<	double viscosity;
116	>	RealType temperature;
117	>	RealType viscosity;
118
119		if (simParams->haveViscosity()) {
120		viscosity = simParams->getViscosity();
#	Line 126 \| Line 127 \| *int main(int argc, char argv[]){**
127		if (simParams->haveTargetTemp()) {
128		temperature = simParams->getTargetTemp();
129		} else {
130	<	sprintf(painCave.errMsg, "target temperaturemust be set\n");
130	>	sprintf(painCave.errMsg, "target temperature must be set\n");
131		painCave.isFatal = 1;
132		simError();
133		}
#	Line 181 \| Line 182 \| *int main(int argc, char argv[]){**
182
183		//if beads option is turned on, skip the calculation
184		if (!args_info.beads_flag) {
185	<	shape->calcHydroProps(model, viscosity, temperature);
186	<	model->writeHydroProps(outputDiff);
185	>	model->calcHydroProps(shape, viscosity, temperature);
186	>	model->writeHydroProps(outputDiff);
187		}
188	<
188	>
189		delete model;
190		}
191
#	Line 200 \| Line 201 \| void registerHydrodynamicsModels() {
201		HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<AnalyticalModel>("AnalyticalModel"));
202
203		}
203	–

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines