Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2010-11-05 18:20:32 +00:00
3 changed files with 6 additions and 6 deletions

View File

@ -268,7 +268,7 @@ kOmegaSST::kOmegaSST
/ max
(
a1_*omega_,
F2()*sqrt(magSqr(symm(fvc::grad(U_))))
F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_))))
)
);
mut_.correctBoundaryConditions();
@ -365,7 +365,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity
mut_ =
a1_*rho_*k_
/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
/max(a1_*omega_, F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_)))));
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
@ -446,7 +446,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity
mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(2.0*S2));
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity

View File

@ -246,7 +246,7 @@ kOmegaSST::kOmegaSST
/ max
(
a1_*omega_,
F2()*mag(symm(fvc::grad(U_)))
F2()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
)
);
nut_.correctBoundaryConditions();
@ -400,7 +400,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity
nut_ = a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
nut_ = a1_*k_/max(a1_*omega_, F2()*sqrt(2*S2));
nut_.correctBoundaryConditions();
}