Backported dev2(T(grad(U)) in turbulence models from vanilla 3.0.1
This commit is contained in:
parent
7c0b9aee42
commit
0200a880dc
31 changed files with 35 additions and 35 deletions
|
@ -128,7 +128,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -143,7 +143,7 @@ tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
|
|||
fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U))
|
||||
+ fvc::laplacian(0.95*muSgs_, U, "laplacian(muEff,U)")
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(mu()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(mu()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -283,7 +283,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -269,7 +269,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
|
|||
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
|
||||
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(mu()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(mu()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -279,7 +279,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
|
|||
fvc::div(rho_*R_)
|
||||
+ fvc::laplacian(mut_, U)
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(mu()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(mu()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -298,7 +298,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
|
|||
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
|
||||
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(mu()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(mu()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -308,7 +308,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
|
|||
fvc::div(rho_*R_)
|
||||
+ fvc::laplacian(mut_, U)
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(mu()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(mu()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -244,7 +244,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -243,7 +243,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -295,7 +295,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(muEff_, U)
|
||||
- fvc::div(muEff_*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(muEff_*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -226,7 +226,7 @@ tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -369,7 +369,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -171,7 +171,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -260,7 +260,7 @@ tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -189,7 +189,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(muEff(), U)
|
||||
- fvc::div(muEff()*dev2(fvc::grad(U)().T()))
|
||||
- fvc::div(muEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevBeff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ Smagorinsky2::Smagorinsky2
|
|||
|
||||
tmp<volSymmTensorField> Smagorinsky2::B() const
|
||||
{
|
||||
volSymmTensorField D = dev(symm(fvc::grad(U())));
|
||||
volSymmTensorField D = dev2(T(fvc::grad(U())));
|
||||
|
||||
return (((2.0/3.0)*I)*k() - 2.0*nuSgs_*D - (2.0*cD2_)*delta()*(D&D));
|
||||
}
|
||||
|
@ -94,7 +94,7 @@ tmp<fvVectorMatrix> Smagorinsky2::divDevBeff
|
|||
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -348,7 +348,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevBeff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -425,7 +425,7 @@ tmp<volSymmTensorField> kOmegaSSTSAS::B() const
|
|||
|
||||
tmp<volSymmTensorField> kOmegaSSTSAS::devBeff() const
|
||||
{
|
||||
return -nuEff()*dev(twoSymm(fvc::grad(U())));
|
||||
return -nuEff()*dev(symm(fvc::grad(U())));
|
||||
}
|
||||
|
||||
|
||||
|
@ -433,7 +433,7 @@ tmp<fvVectorMatrix> kOmegaSSTSAS::divDevBeff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@ tmp<fvVectorMatrix> laminar::divDevBeff(volVectorField& U) const
|
|||
{
|
||||
return
|
||||
(
|
||||
- fvm::laplacian(nu(), U) - fvc::div(nu()*dev(fvc::grad(U)().T()))
|
||||
- fvm::laplacian(nu(), U) - fvc::div(nu()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -195,7 +195,7 @@ tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -201,7 +201,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -281,7 +281,7 @@ tmp<fvVectorMatrix> LienCubicKE::divDevReff(volVectorField& U) const
|
|||
(
|
||||
fvc::div(nonlinearStress_)
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -271,7 +271,7 @@ tmp<fvVectorMatrix> NonlinearKEShih::divDevReff(volVectorField& U) const
|
|||
(
|
||||
fvc::div(nonlinearStress_)
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -211,7 +211,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -317,7 +317,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff_, U)
|
||||
- fvc::div(nuEff_*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff_*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -197,7 +197,7 @@ tmp<fvVectorMatrix> coupledKEpsilon::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -183,7 +183,7 @@ tmp<fvVectorMatrix> kEpsilon::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -345,7 +345,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -248,7 +248,7 @@ tmp<fvVectorMatrix> qZeta::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -236,7 +236,7 @@ tmp<fvVectorMatrix> realizableKE::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -193,7 +193,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
|
|||
return
|
||||
(
|
||||
- fvm::laplacian(nuEff(), U)
|
||||
- fvc::div(nuEff()*dev(fvc::grad(U)().T()))
|
||||
- fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue