diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 1bf5cc2b52..2f35a8bfd2 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -197,15 +197,16 @@ tmp LESModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->rho() * this->epsilon() + ) + - this->rho() * this->epsilon() ) ); } -tmp LESModel::thermalDissipationEff() const +tmp LESModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -215,13 +216,13 @@ tmp 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 7a87a71315..8808c1e41a 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 thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 849f25f01a..9ce1db5ef9 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -207,15 +207,16 @@ tmp RASModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->rho() * this->epsilon() + ) + - this->rho() * this->epsilon() ) ); } -tmp RASModel::thermalDissipationEff() const +tmp RASModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -225,13 +226,13 @@ tmp 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 22295848d4..0e27f72924 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 thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index 2f55ecdee5..a2ec1a7f3b 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -193,13 +193,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -209,13 +209,13 @@ tmp 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 1e26261da7..f58db6c9e4 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 thermalDissipationEff() const; + virtual tmp 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 aa630ee977..c15dc89b15 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 be8e2f1da6..74b6b5fb06 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -211,13 +211,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -227,13 +227,13 @@ tmp 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 3b9b4d8fbd..6bd3c5bdfa 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 thermalDissipationEff() const; + virtual tmp 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 3e4ff24e43..8c80b4ab57 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 thermalDissipationEff() const = 0; + virtual tmp 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 62f18f3981..87d9f4fb41 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -156,15 +156,16 @@ tmp LESModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->epsilon() + ) + - this->epsilon() ) ); } -tmp LESModel::thermalDissipationEff() const +tmp LESModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -174,13 +175,13 @@ tmp 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 5c0c615eb6..e5bd2545b8 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 thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index 4cc9fd07b9..4d1d58db70 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -192,15 +192,16 @@ tmp RASModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->epsilon() + ) + - this->epsilon() ) ); } -tmp RASModel::thermalDissipationEff() const +tmp RASModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -210,13 +211,13 @@ tmp 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 3a2f0aa7e9..4d895ea53f 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 thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index 83e8913525..a58d944196 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -192,13 +192,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -208,13 +208,13 @@ tmp 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 1617d60064..7bb4ba1b7b 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 thermalDissipationEff() const; + virtual tmp 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 07ca14c373..d9318d2a82 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 e3a9c30fd7..93fdbc813d 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -215,13 +215,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -231,13 +231,13 @@ tmp 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 aa83346820..ba0c59201c 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 thermalDissipationEff() const; + virtual tmp 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 a9d1465e77..d6fa7f2ca2 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 thermalDissipationEff() const = 0; + virtual tmp thermalDissipationEquilibrium() const = 0; //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0;