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

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/ApproximationModel.cpp (file contents):
Revision 2649 by tim, Fri Mar 17 23:20:35 2006 UTC vs.
Revision 2650 by tim, Tue Mar 21 15:33:04 2006 UTC

#	Line 124 \| Line 124 \| bool ApproximationModel::calcHydroPropsAtCR(std::vecto
124		Vector3d Rij = beads[i].pos - beads[j].pos;
125		double rij = Rij.length();
126		double rij2 = rij * rij;
127	<	double sumSigma2OverRij2 = ((beads[i].radiusbeads[i].radius) + (beads[i].radiusbeads[i].radius)) / rij2;
127	>	double sumSigma2OverRij2 = ((beads[i].radiusbeads[i].radius) + (beads[j].radiusbeads[j].radius)) / rij2;
128		Mat3x3d tmpMat;
129		tmpMat = outProduct(Rij, Rij) / rij2;
130		double constant = 8.0 * NumericConstant::PI * viscosity * rij;
#	Line 141 \| Line 141 \| bool ApproximationModel::calcHydroPropsAtCR(std::vecto
141
142		//invert B Matrix
143		invertMatrix(B, C);
144	<
144	>
145		//prepare U Matrix relative to arbitrary origin O(0.0, 0.0, 0.0)
146		std::vector<Mat3x3d> U;
147		for (int i = 0; i < nbeads; ++i) {
#	Line 287 \| Line 287 \| bool ApproximationModel::calcHydroPropsAtCD(std::vecto
287		Vector3d Rij = beads[i].pos - beads[j].pos;
288		double rij = Rij.length();
289		double rij2 = rij * rij;
290	<	double sumSigma2OverRij2 = ((beads[i].radiusbeads[i].radius) + (beads[i].radiusbeads[i].radius)) / rij2;
290	>	double sumSigma2OverRij2 = ((beads[i].radiusbeads[i].radius) + (beads[j].radiusbeads[j].radius)) / rij2;
291		Mat3x3d tmpMat;
292		tmpMat = outProduct(Rij, Rij) / rij2;
293		double constant = 8.0 * NumericConstant::PI * viscosity * rij;

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