ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/hydrodynamics/ApproximationModel.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/ApproximationModel.cpp (file contents):
Revision 2773 by tim, Thu May 25 16:27:27 2006 UTC vs.
Revision 2774 by tim, Thu May 25 17:02:00 2006 UTC

# Line 103 | Line 103 | namespace oopse {
103                Mat3x3d tmpMat;
104                tmpMat = outProduct(Rij, Rij) / rij2;
105                RealType constant = 8.0 * NumericConstant::PI * viscosity * rij;
106 <              Tij = ((1.0 + sumSigma2OverRij2/3.0) * I + (1.0 - sumSigma2OverRij2) * tmpMat ) / constant;
106 >              RealType tmp1 = 1.0 + sumSigma2OverRij2/3.0;
107 >              RealType tmp2 = 1.0 - sumSigma2OverRij2;
108 >              Tij = (tmp1 * I + tmp2 * tmpMat ) / constant;
109              }else {
110                RealType constant = 1.0 / (6.0 * NumericConstant::PI * viscosity * beads[i].radius);
111                Tij(0, 0) = constant;
# Line 267 | Line 269 | namespace oopse {
269            Mat3x3d tmpMat;
270            tmpMat = outProduct(Rij, Rij) / rij2;
271            RealType constant = 8.0 * NumericConstant::PI * viscosity * rij;
272 <          Tij = ((1.0 + sumSigma2OverRij2/3.0) * I + (1.0 - sumSigma2OverRij2) * tmpMat ) / constant;
272 >          RealType tmp1 = 1.0 + sumSigma2OverRij2/3.0;
273 >          RealType tmp2 = 1.0 - sumSigma2OverRij2;
274 >          Tij = (tmp1 * I + tmp2 * tmpMat ) / constant;
275          }else {
276            RealType constant = 1.0 / (6.0 * NumericConstant::PI * viscosity * beads[i].radius);
277            Tij(0, 0) = constant;

Diff Legend

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