[ViewVC] Diff of: group/trunk/OOPSE-4/src/applications/hydrodynamics/ApproximationModel.cpp

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/ApproximationModel.cpp (file contents):
Revision 2748 by tim, Wed Mar 29 18:09:26 2006 UTC vs.
Revision 2749 by tim, Wed May 10 01:44:48 2006 UTC

#	Line 87 \| Line 87 \| bool ApproximationModel::internalCalcHydroProps(Shape*
87		HydroProps cr;
88		HydroProps cd;
89		calcHydroPropsAtCR(beads_, viscosity, temperature, cr);
90	<	calcHydroPropsAtCD(beads_, viscosity, temperature, cd);
90	>	//calcHydroPropsAtCD(beads_, viscosity, temperature, cd);
91		setCR(cr);
92		setCD(cd);
93
#	Line 156 \| Line 156 \| bool ApproximationModel::calcHydroPropsAtCR(std::vecto
156
157		Xiott += Cij;
158		Xiotr += U[i] * Cij;
159	<	Xiorr += -U[i] * Cij * U[j] + (6 * viscosity * volume) * I;
159	>	//Xiorr += -U[i] * Cij * U[j] + (6 * viscosity * volume) * I;
160	>	Xiorr += -U[i] * Cij * U[j];
161		}
162		}
163
#	Line 319 \| Line 320 \| bool ApproximationModel::calcHydroPropsAtCD(std::vecto
320
321		Xitt += Cij;
322		Xitr += U[i] * Cij;
323	<	Xirr += -U[i] * Cij * U[j] + (6 * viscosity * volume) * I;
323	>	//Xirr += -U[i] * Cij * U[j] + (6 * viscosity * volume) * I;
324	>	Xirr += -U[i] * Cij * U[j];
325		}
326		}
327

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