diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 1bf5cc2b5237783077a9520f3a6db55069d10786..2f35a8bfd230b2d6de3dae2ba0d195c8a11c92b9 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -197,15 +197,16 @@ tmp<volScalarField> LESModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->rho() * this->epsilon() + ) + - this->rho() * this->epsilon() ) ); } -tmp<volScalarField> LESModel::thermalDissipationEff() const +tmp<volScalarField> LESModel::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -215,13 +216,13 @@ tmp<volScalarField> LESModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->muEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->rho() * this->k() ) && tgradU() diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H index 7a87a71315f19e8ea0d8bc4660b08cf1d30125f5..8808c1e41a0ad0843061be678fb67057adae66ce 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H @@ -300,7 +300,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp<volTensorField>& gradU) by supplying diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 849f25f01aff42515c4dce3977fae896e2069325..9ce1db5ef9609fa8171150f77f09c577f6258447 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -207,15 +207,16 @@ tmp<volScalarField> RASModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->rho() * this->epsilon() + ) + - this->rho() * this->epsilon() ) ); } -tmp<volScalarField> RASModel::thermalDissipationEff() const +tmp<volScalarField> RASModel::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -225,13 +226,13 @@ tmp<volScalarField> RASModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->muEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->rho() * this->k() ) && tgradU() diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H index 22295848d44cc58a4f05a7e0022d30248a6a50c6..0e27f72924a552bad2c3b27b7f352e74f112ab9c 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H @@ -352,7 +352,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Return yPlus for the given patch virtual tmp<scalarField> yPlus(const label patchI) const; diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index 2f55ecdee509d9b2581e1d77cba3d0fd8437b6b1..a2ec1a7f3be9c0e6c62d3f166e537acd0692de34 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -193,13 +193,13 @@ tmp<volScalarField> laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp<volScalarField> laminar::thermalDissipationEff() const +tmp<volScalarField> laminar::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -209,13 +209,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H index 1e26261da777aebd0f550528cdc191d4c59e5aeb..f58db6c9e4a13634fe883ba53016ce6273987ef7 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H @@ -119,7 +119,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C index aa630ee97773f5a53385369767923c82ad5eb52a..c15dc89b15276712bfe7b16c13ff9199fdd35b73 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C +++ b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C @@ -90,7 +90,7 @@ dissipationSelector::dissipation() const } else if (treatment_ == equilibrium) { - return turbModel_.thermalDissipationEff(); + return turbModel_.thermalDissipationEquilibrium(); } else { diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C index be8e2f1da648d1f0d2c77da83619c19cce7a48c1..74b6b5fb06c4f2705692d595a956ccce3286e483 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -211,13 +211,13 @@ tmp<volScalarField> laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp<volScalarField> laminar::thermalDissipationEff() const +tmp<volScalarField> laminar::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -227,13 +227,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H index 3b9b4d8fbd8be010acffb5854cb17b3ca6c12293..6bd3c5bdfaf1e31f78acf758cbe839229a49581f 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H @@ -129,7 +129,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H index 3e4ff24e43cc4f959562774b4211d37bb3ddc69c..8c80b4ab5740ba848e24570022a53435783547e0 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H @@ -217,7 +217,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const = 0; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const = 0; //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 62f18f3981615931d36a7ca0f3822ae6e3d2aae4..87d9f4fb41e43ded80953ab5896ded309dd83fd4 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -156,15 +156,16 @@ tmp<volScalarField> LESModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->epsilon() + ) + - this->epsilon() ) ); } -tmp<volScalarField> LESModel::thermalDissipationEff() const +tmp<volScalarField> LESModel::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -174,13 +175,13 @@ tmp<volScalarField> LESModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->nuEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->k() ) && tgradU() diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H index 5c0c615eb6a01918973ac7b21a74264c6cb297db..e5bd2545b8b54737696df832d759797108214b38 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H @@ -249,7 +249,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp<volTensorField>& gradU) by supplying diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index 4cc9fd07b95f94934f543d11c2e12dc7d5dd7384..4d1d58db705e3c131c892e50747ceb45b4e054a1 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -192,15 +192,16 @@ tmp<volScalarField> RASModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->epsilon() + ) + - this->epsilon() ) ); } -tmp<volScalarField> RASModel::thermalDissipationEff() const +tmp<volScalarField> RASModel::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -210,13 +211,13 @@ tmp<volScalarField> RASModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->nuEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->k() ) && tgradU() diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H index 3a2f0aa7e90c8bf21ac0212b49c5ae88809f1ec4..4d895ea53f5aa22cf6cc0747f0f8adab4ddcd391 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H @@ -333,7 +333,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Return yPlus for the given patch virtual tmp<scalarField> yPlus(const label patchI) const; diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index 83e89135258ea85812552344f84467abd18db5bd..a58d9441961697af06e577e593a869fe40e55746 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -192,13 +192,13 @@ tmp<volScalarField> laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp<volScalarField> laminar::thermalDissipationEff() const +tmp<volScalarField> laminar::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -208,13 +208,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H index 1617d60064accb35bcaa27bfb4cdeaa104894db7..7bb4ba1b7b8d143265fd21a76a0ed9f3b1ce4745 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H @@ -111,7 +111,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C index 07ca14c373c7ea0295782903bef445c5c9a7814a..d9318d2a8294cc2f4f44e6481c810d1d9f4de6a4 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C @@ -90,7 +90,7 @@ dissipationSelector::dissipation() const } else if (treatment_ == equilibrium) { - return turbModel_.thermalDissipationEff(); + return turbModel_.thermalDissipationEquilibrium(); } else { diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index e3a9c30fd77efd2abe8c08e96206366e44195229..93fdbc813d2f1a96fdf3e108547e68f8a8bedfc1 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -215,13 +215,13 @@ tmp<volScalarField> laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp<volScalarField> laminar::thermalDissipationEff() const +tmp<volScalarField> laminar::thermalDissipationEquilibrium() const { tmp<volTensorField> tgradU = fvc::grad(this->U()); @@ -231,13 +231,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H index aa83346820fccd17fdcebefcac315718b8ab583d..ba0c59201c21ce6f2cfa8ac0e4dfb6f3e30ff050 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H @@ -117,7 +117,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H index a9d1465e772740353a7e7724f3c26715c9c0efe4..d6fa7f2ca2c8ead201d88c3b407235ff8a9d4f9a 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H @@ -197,7 +197,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp<volScalarField> thermalDissipationEff() const = 0; + virtual tmp<volScalarField> thermalDissipationEquilibrium() const = 0; //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0;