diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 4ec58ce79e..0be19914dc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -276,9 +276,9 @@ void Foam::ReactingParcel::calc td, dt, cellI, + Re, Ts, mus/rhos, - Re, d0, T0, mass0, diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index 20221e63cd..eb6e0c4784 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -145,7 +145,7 @@ LaunderSharmaKE::LaunderSharmaKE IOobject::NO_READ, IOobject::AUTO_WRITE ), - autoCreateK("k", mesh_) + mesh_ ), epsilon_ @@ -158,21 +158,10 @@ LaunderSharmaKE::LaunderSharmaKE IOobject::NO_READ, IOobject::AUTO_WRITE ), - autoCreateEpsilon("epsilon", mesh_) + mesh_ ), - mut_ - ( - IOobject - ( - "mut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - autoCreateMut("mut", mesh_) - ), + mut_(rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_)), alphat_ ( @@ -187,9 +176,6 @@ LaunderSharmaKE::LaunderSharmaKE autoCreateAlphat("alphat", mesh_) ) { - mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_); - mut_.correctBoundaryConditions(); - alphat_ = mut_/Prt_; alphat_.correctBoundaryConditions(); @@ -275,8 +261,7 @@ void LaunderSharmaKE::correct() if (!turbulence_) { // Re-calculate viscosity - mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_); - mut_.correctBoundaryConditions(); + mut_ == rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_); // Re-calculate thermal diffusivity alphat_ = mut_/Prt_; @@ -304,8 +289,6 @@ void LaunderSharmaKE::correct() volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU())))); tgradU.clear(); - // Update espsilon and G at the wall - epsilon_.boundaryField().updateCoeffs(); // Dissipation equation @@ -322,9 +305,6 @@ void LaunderSharmaKE::correct() ); epsEqn().relax(); - - epsEqn().boundaryManipulate(epsilon_.boundaryField()); - solve(epsEqn); bound(epsilon_, epsilon0_); @@ -348,8 +328,8 @@ void LaunderSharmaKE::correct() // Re-calculate viscosity - mut_ = Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); - mut_.correctBoundaryConditions(); + mut_ == Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); + // Re-calculate thermal diffusivity alphat_ = mut_/Prt_; diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index 5d282cf332..321a7b5ff9 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -114,7 +114,7 @@ LamBremhorstKE::LamBremhorstKE IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateEpsilon("epsilon", mesh_) + mesh_ ), y_(mesh_), @@ -127,22 +127,8 @@ LamBremhorstKE::LamBremhorstKE *(scalar(1) + 20.5/(Rt_ + SMALL)) ), - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateNut("nut", mesh_) - ) + nut_(Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_)) { - nut_ = Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_); - nut_.correctBoundaryConditions(); - printCoeffs(); } @@ -234,6 +220,7 @@ void LamBremhorstKE::correct() volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_)))); + // Calculate parameters and coefficients for low-Reynolds number model Rt_ = sqr(k_)/(nu()*epsilon_); @@ -244,8 +231,6 @@ void LamBremhorstKE::correct() volScalarField f1 = scalar(1) + pow(0.05/(fMu_ + SMALL), 3); volScalarField f2 = scalar(1) - exp(-sqr(Rt_)); - // Update espsilon and G at the wall - epsilon_.boundaryField().updateCoeffs(); // Dissipation equation @@ -260,9 +245,6 @@ void LamBremhorstKE::correct() ); epsEqn().relax(); - - epsEqn().boundaryManipulate(epsilon_.boundaryField()); - solve(epsEqn); bound(epsilon_, epsilon0_); @@ -284,8 +266,7 @@ void LamBremhorstKE::correct() // Re-calculate viscosity - nut_ = Cmu_*fMu_*sqr(k_)/epsilon_; - nut_.correctBoundaryConditions(); + nut_ == Cmu_*fMu_*sqr(k_)/epsilon_; } diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H index fad278186b..d9b4da560f 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -50,7 +50,7 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class LamBremhorstKE Declaration + Class LamBremhorstKE Declaration \*---------------------------------------------------------------------------*/ class LamBremhorstKE diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index c21c9676b6..ad2ebe0821 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -133,22 +133,8 @@ LaunderSharmaKE::LaunderSharmaKE mesh_ ), - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateNut("nut", mesh_) - ) + nut_(Cmu_*fMu()*sqr(k_)/(epsilonTilda_ + epsilonSmall_)) { - nut_ = Cmu_*fMu()*sqr(k_)/(epsilonTilda_ + epsilonSmall_); - nut_.correctBoundaryConditions(); - printCoeffs(); } @@ -235,7 +221,7 @@ void LaunderSharmaKE::correct() volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); - volScalarField G = nut_*S2; + volScalarField G("RASModel::G", nut_*S2); volScalarField E = 2.0*nu()*nut_*fvc::magSqrGradGrad(U_); volScalarField D = 2.0*nu()*magSqr(fvc::grad(sqrt(k_))); @@ -276,8 +262,7 @@ void LaunderSharmaKE::correct() // Re-calculate viscosity - nut_ = Cmu_*fMu()*sqr(k_)/epsilonTilda_; - nut_.correctBoundaryConditions(); + nut_ == Cmu_*fMu()*sqr(k_)/epsilonTilda_; } diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H index 0eb2ce304d..1b0010d870 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -61,7 +61,7 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class LaunderSharmaKE Declaration + Class LaunderSharmaKE Declaration \*---------------------------------------------------------------------------*/ class LaunderSharmaKE diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C index 7e9a54bfd8..b7a82d6d1b 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C @@ -285,7 +285,7 @@ void LienLeschzinerLowRe::correct() volScalarField f2 = scalar(1) - 0.3*exp(-sqr(Rt)); - volScalarField G = Cmu_*fMu*sqr(k_)/epsilon_*S2; + volScalarField G("RASModel::G", Cmu_*fMu*sqr(k_)/epsilon_*S2); // Dissipation equation @@ -297,7 +297,7 @@ void LienLeschzinerLowRe::correct() == C1_*G*epsilon_/k_ // E-term - + C2_*f2*Cmu75*pow(k_, scalar(0.5)) + + C2_*f2*Cmu75*sqrt(k_) /(kappa_*y_*(scalar(1) - exp(-Aepsilon_*yStar_))) *exp(-Amu_*sqr(yStar_))*epsilon_ - fvm::Sp(C2_*f2*epsilon_/k_, epsilon_) @@ -305,8 +305,8 @@ void LienLeschzinerLowRe::correct() epsEqn().relax(); -# include "LienLeschzinerLowReSetWallDissipation.H" -# include "wallDissipationI.H" + #include "LienLeschzinerLowReSetWallDissipation.H" + #include "wallDissipationI.H" solve(epsEqn); bound(epsilon_, epsilon0_);