diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index 2fc874981e..c151f4ffcb 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -157,7 +157,7 @@ int main(int argc, char *argv[]) + aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg) + aSf*p_pos - aSf*p_neg; - volTensorField tauMC("tauMC", mu*dev2(fvc::grad(U)().T())); + volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U)))); // --- Solve density Info<< max(rho) << " " << min(rho) << endl; diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 1f77191f4c..42c8eb11d6 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) + aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg) + aSf*p_pos - aSf*p_neg; - volTensorField tauMC("tauMC", mu*dev2(fvc::grad(U)().T())); + volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U)))); // --- Solve density solve(fvm::ddt(rho) + fvc::div(phi)); diff --git a/etc/settings.sh b/etc/settings.sh index 785c3f97dd..f9bd097de3 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -259,7 +259,8 @@ unset MPI_ARCH_PATH MPI_HOME case "$WM_MPLIB" in OPENMPI) - mpi_version=openmpi-1.4.1 + #mpi_version=openmpi-1.4.1 + mpi_version=openmpi-1.5 export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version # Tell OpenMPI where to find its install directory diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C index 7a765d0568..f015cf5157 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C @@ -36,6 +36,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +UNARY_FUNCTION(tensor, tensor, T, transform) UNARY_FUNCTION(scalar, tensor, tr, transform) UNARY_FUNCTION(sphericalTensor, tensor, sph, transform) UNARY_FUNCTION(symmTensor, tensor, symm, transform) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H index 30b664e909..e70b3d1f77 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H @@ -49,6 +49,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +UNARY_FUNCTION(tensor, tensor, T, transform) UNARY_FUNCTION(scalar, tensor, tr, transform) UNARY_FUNCTION(sphericalTensor, tensor, sph, transform) UNARY_FUNCTION(symmTensor, tensor, symm, transform) diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C index ee623a30bb..93dcdd8cb1 100644 --- a/src/OpenFOAM/global/argList/argList.C +++ b/src/OpenFOAM/global/argList/argList.C @@ -736,7 +736,7 @@ Foam::argList::argList { Info<< "Slaves : " << slaveProcs << nl; if (roots.size()) - { + { Info<< "Roots : " << roots << nl; } Info<< "Pstream initialized with:" << nl @@ -770,7 +770,8 @@ Foam::argList::argList if (bannerEnabled) { - Info<< "Monitoring run-time modified files using " + Info<< "fileModificationChecking : " + << "Monitoring run-time modified files using " << regIOobject::fileCheckTypesNames [ regIOobject::fileModificationChecking diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C index cb36acd1d2..2fa4e4324d 100644 --- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C +++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C @@ -134,7 +134,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 65d2126f23..9073d79b95 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 f674b03e40..57175b380b 100644 --- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C @@ -285,7 +285,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 b90b1f5f14..f07252c7e2 100644 --- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C +++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C @@ -274,7 +274,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 @@ -284,7 +284,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 130c7a6dcb..411bde1e35 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -303,7 +303,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 @@ -313,7 +313,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 452e0b5a52..94cbc64e76 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -248,7 +248,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 1e4fc21cb7..70aaedec2a 100644 --- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -247,7 +247,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 b391afff09..04022940e8 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -345,7 +345,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 160ada3f60..6f26937754 100644 --- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C @@ -230,7 +230,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 96d14423ec..c4ad4c93ac 100644 --- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C @@ -327,7 +327,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 a98801842a..71a1ee0886 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -194,7 +194,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 a81e76be6e..b32aa5a079 100644 --- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C +++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C @@ -261,7 +261,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 b51f3938a6..8cf38ca5ad 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -215,7 +215,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 e3fe43a5f3..0399ecccc8 100644 --- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C +++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C @@ -97,7 +97,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()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C index 95574f28ef..5e853c054a 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C @@ -96,7 +96,7 @@ tmp Smagorinsky2::divDevBeff return ( - - fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(fvc::grad(U)().T())) + - fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C index 90ffc2adba..ba09ee6572 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C @@ -349,7 +349,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()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C index 7eb2619cd8..3a1c1eb75a 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -435,7 +435,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()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C index ad524887cd..767dfeae22 100644 --- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C @@ -146,7 +146,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()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index 46fc6a8863..c60df67eee 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -199,7 +199,7 @@ tmp LamBremhorstKE::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/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index ee34ef8be7..3d92720c3c 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -205,7 +205,7 @@ tmp LaunderSharmaKE::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/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C index 0154cf2c8b..c7ad938fe2 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C @@ -294,7 +294,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()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C index b961771ea2..c81f604388 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C @@ -358,7 +358,7 @@ tmp LienCubicKELowRe::divDevReff(volVectorField& U) const ( fvc::div(nonlinearStress_) - 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/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C index 4a76228d23..b12f4774c0 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C @@ -244,7 +244,7 @@ tmp LienLeschzinerLowRe::divDevReff(volVectorField& U) const ( - fvm::laplacian(nuEff(), U) //- (fvc::grad(U) & fvc::grad(nuEff())) - - fvc::div(nuEff()*fvc::grad(U)().T()) + - fvc::div(nuEff()*T(fvc::grad(U))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C index facd5b4453..318791559f 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C @@ -284,7 +284,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()*dev(T(fvc::grad(U)))) ); } diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C index b7ecd85483..9d9f8f0093 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -215,7 +215,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 c8d51febd2..02eeaa318f 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -325,7 +325,7 @@ tmp SpalartAllmaras::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/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C index d7dd3c2578..50eb3c2283 100644 --- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C @@ -187,7 +187,7 @@ tmp kEpsilon::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/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C index f316234661..77f62cb5bb 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C +++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C @@ -196,7 +196,7 @@ tmp kOmega::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/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C index 6dbebeb0d7..60dc98395a 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C @@ -303,7 +303,7 @@ tmp kOmegaSST::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/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index afc6803e03..9a7a2a3e0f 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -172,7 +172,7 @@ tmp laminar::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/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C index 41929db9fe..8fb23887ce 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C @@ -257,7 +257,7 @@ tmp qZeta::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/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C index 5f870de0a7..d6e49f0b66 100644 --- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C +++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C @@ -237,7 +237,7 @@ tmp realizableKE::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/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index 580f764d5a..7ab42b7fb8 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -198,7 +198,7 @@ tmp laminar::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/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes index a8972de9c2..124240f261 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes @@ -36,7 +36,7 @@ divSchemes div(phi,R) Gauss upwind; div(R) Gauss linear; div(phi,nuTilda) Gauss upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev(T(grad(U))))) Gauss linear; } laplacianSchemes