From 5b09b44b1670dbee082b327564d58bbdefe55101 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 13 Jul 2009 16:08:58 +0200
Subject: [PATCH] sign change on thermalDissipation source (consistency with
 momentum source)

- rename thermalDissipationEff() -> thermalDissipationEquilibrium()
---
 .../compressible/LES/LESModel/LESModel.C              | 11 ++++++-----
 .../compressible/LES/LESModel/LESModel.H              |  2 +-
 .../compressible/RAS/RASModel/RASModel.C              | 11 ++++++-----
 .../compressible/RAS/RASModel/RASModel.H              |  2 +-
 .../compressible/RAS/laminar/laminar.C                |  8 ++++----
 .../compressible/RAS/laminar/laminar.H                |  2 +-
 .../dissipationSelector/dissipationSelector.C         |  2 +-
 .../compressible/turbulenceModel/laminar/laminar.C    |  8 ++++----
 .../compressible/turbulenceModel/laminar/laminar.H    |  2 +-
 .../compressible/turbulenceModel/turbulenceModel.H    |  2 +-
 .../incompressible/LES/LESModel/LESModel.C            | 11 ++++++-----
 .../incompressible/LES/LESModel/LESModel.H            |  2 +-
 .../incompressible/RAS/RASModel/RASModel.C            | 11 ++++++-----
 .../incompressible/RAS/RASModel/RASModel.H            |  2 +-
 .../incompressible/RAS/laminar/laminar.C              |  8 ++++----
 .../incompressible/RAS/laminar/laminar.H              |  2 +-
 .../dissipationSelector/dissipationSelector.C         |  2 +-
 .../incompressible/turbulenceModel/laminar/laminar.C  |  8 ++++----
 .../incompressible/turbulenceModel/laminar/laminar.H  |  2 +-
 .../incompressible/turbulenceModel/turbulenceModel.H  |  2 +-
 20 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 1bf5cc2b523..2f35a8bfd23 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 7a87a71315f..8808c1e41a0 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 849f25f01af..9ce1db5ef96 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 22295848d44..0e27f72924a 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 2f55ecdee50..a2ec1a7f3be 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 1e26261da77..f58db6c9e4a 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 aa630ee9777..c15dc89b152 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 be8e2f1da64..74b6b5fb06c 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 3b9b4d8fbd8..6bd3c5bdfaf 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 3e4ff24e43c..8c80b4ab574 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 62f18f39816..87d9f4fb41e 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 5c0c615eb6a..e5bd2545b8b 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 4cc9fd07b95..4d1d58db705 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 3a2f0aa7e90..4d895ea53f5 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 83e89135258..a58d9441961 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 1617d60064a..7bb4ba1b7b8 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 07ca14c373c..d9318d2a829 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 e3a9c30fd77..93fdbc813d2 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 aa83346820f..ba0c59201c2 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 a9d1465e772..d6fa7f2ca2c 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;
-- 
GitLab