sign change on thermalDissipation source (consistency with momentum source)

- rename thermalDissipationEff() -> thermalDissipationEquilibrium()

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()

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

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()

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;

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()
         )
     );
 }

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();

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
     {

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()
         )
     );
 }

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();

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;

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()

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

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()

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;

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()
         )
     );
 }

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();

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
     {

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()
         )
     );
 }

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();

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;