From 0200a880dc1bc131ce26c18830dadffd919a0532 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Fri, 15 Apr 2016 22:47:50 +0200 Subject: [PATCH] Backported dev2(T(grad(U)) in turbulence models from vanilla 3.0.1 --- .../compressible/LES/GenEddyVisc/GenEddyVisc.C | 2 +- .../compressible/LES/GenSGSStress/GenSGSStress.C | 2 +- .../compressible/LES/SpalartAllmaras/SpalartAllmaras.C | 2 +- src/turbulenceModels/compressible/RAS/LRR/LRR.C | 4 ++-- .../compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 4 ++-- .../compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 +- .../compressible/RAS/RNGkEpsilon/RNGkEpsilon.C | 2 +- .../compressible/RAS/SpalartAllmaras/SpalartAllmaras.C | 2 +- src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C | 2 +- src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C | 2 +- src/turbulenceModels/compressible/RAS/laminar/laminar.C | 2 +- .../compressible/RAS/realizableKE/realizableKE.C | 2 +- .../compressible/turbulenceModel/laminar/laminar.C | 2 +- .../incompressible/LES/GenEddyVisc/GenEddyVisc.C | 2 +- .../incompressible/LES/Smagorinsky2/Smagorinsky2.C | 4 ++-- .../incompressible/LES/SpalartAllmaras/SpalartAllmaras.C | 2 +- .../incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C | 4 ++-- src/turbulenceModels/incompressible/LES/laminar/laminar.C | 2 +- .../incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C | 2 +- .../incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 +- .../incompressible/RAS/LienCubicKE/LienCubicKE.C | 2 +- .../incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C | 2 +- .../incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C | 2 +- .../incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C | 2 +- .../incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C | 2 +- src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C | 2 +- src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C | 2 +- src/turbulenceModels/incompressible/RAS/laminar/laminar.C | 2 +- src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C | 2 +- .../incompressible/RAS/realizableKE/realizableKE.C | 2 +- .../incompressible/turbulenceModel/laminar/laminar.C | 2 +- 31 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C index 33442b596..4d754cdfd 100644 --- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C +++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C @@ -128,7 +128,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C index 3287be484..d8c023fa3 100644 --- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C +++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C @@ -143,7 +143,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C index 2d66f9f26..01b3804de 100644 --- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C @@ -283,7 +283,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C index f5c0e536c..df2ca9e2d 100644 --- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C +++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C @@ -269,7 +269,7 @@ tmp 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 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)))) ); } } diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C index 10926e1db..2dcf08edb 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -298,7 +298,7 @@ tmp 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 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)))) ); } } diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index 8a0981df6..114670f33 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -244,7 +244,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C index 85f3d596c..84d2782a5 100644 --- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -243,7 +243,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C index 080c576de..98f37cc92 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -295,7 +295,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C index da139afae..d5bb00b95 100644 --- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C @@ -226,7 +226,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C index 9ebabc7fd..90fe77060 100644 --- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C @@ -369,7 +369,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index 596d3f964..7a43f3fa8 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -171,7 +171,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C index 105d30085..4be61e2ae 100644 --- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C +++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C @@ -260,7 +260,7 @@ tmp 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)))) ); } diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C index 8fd0d8ff3..c677d5998 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -189,7 +189,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C index be9eb9b22..b5055e46c 100644 --- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C +++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C @@ -90,7 +90,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C index 66c890e89..f98fadf47 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C @@ -73,7 +73,7 @@ Smagorinsky2::Smagorinsky2 tmp 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 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C index 8338db89a..0cb487834 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C @@ -348,7 +348,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C index ae6b45b87..5128ef5ca 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -425,7 +425,7 @@ tmp kOmegaSSTSAS::B() const tmp kOmegaSSTSAS::devBeff() const { - return -nuEff()*dev(twoSymm(fvc::grad(U()))); + return -nuEff()*dev(symm(fvc::grad(U()))); } @@ -433,7 +433,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C index 9c50dbce7..e8399469b 100644 --- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C @@ -144,7 +144,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index 97363cc3d..8ff518e5f 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -195,7 +195,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index ea76a7a19..4ad3a712b 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -201,7 +201,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C index 4466fd562..a1dc4f040 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C @@ -281,7 +281,7 @@ tmp 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_)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C index b73419025..c8f7ce0a1 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C @@ -271,7 +271,7 @@ tmp 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_)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C index 72d7b593b..5a63a1908 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -211,7 +211,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C index a144f177e..6daabfa0c 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -317,7 +317,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C b/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C index a90c9a1c1..1c830f324 100644 --- a/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C @@ -197,7 +197,7 @@ tmp 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_)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C index 630a7f458..247ec7ec5 100644 --- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C @@ -183,7 +183,7 @@ tmp 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_)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C index 53f8bd1e6..4de471f1c 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C @@ -345,7 +345,7 @@ tmp 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_)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index a8c4ec789..2c1c95958 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -170,7 +170,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C index c0b5d30a4..f7c722ec4 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C @@ -248,7 +248,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C index e665c7594..7dfc1a449 100644 --- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C +++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C @@ -236,7 +236,7 @@ tmp 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)()))) ); } diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index c8159e54a..367d1b8df 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -193,7 +193,7 @@ tmp 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)()))) ); }