From 98735abbf02472e72ed9f008b536ab59b4f2ab87 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 16 Jun 2008 17:58:16 +0100
Subject: [PATCH] added printCoeffs variable

---
 .../turbulenceModel/turbulenceModel.C            | 16 +++++++---------
 .../turbulenceModel/turbulenceModel.H            |  1 +
 .../turbulenceModel/turbulenceModel.C            | 16 +++++++---------
 .../turbulenceModel/turbulenceModel.H            |  1 +
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index dcf8a25d93..e2c6ed90c3 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -45,7 +45,10 @@ defineRunTimeSelectionTable(turbulenceModel, dictionary);
 
 void turbulenceModel::printCoeffs()
 {
-    Info<< turbulenceModelCoeffs_;
+    if (printCoeffs_)
+    {
+        Info<< turbulenceModelCoeffs_;
+    }
 }
 
 
@@ -81,16 +84,11 @@ turbulenceModel::turbulenceModel
     thermophysicalModel_(thermophysicalModel),
 
     turbulence_(lookup("turbulence")),
+    printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
     turbulenceModelCoeffs_(subDict(type + "Coeffs")),
 
-    kappa_
-    (
-        dimensionedScalar(subDict("wallFunctionCoeffs").lookup("kappa")).value()
-    ),
-    E_
-    (
-        dimensionedScalar(subDict("wallFunctionCoeffs").lookup("E")).value()
-    ),
+    kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))),
+    E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))),
     yPlusLam_(yPlusLam(kappa_, E_)),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
index 715f975548..5036bff206 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
@@ -88,6 +88,7 @@ protected:
         basicThermo& thermophysicalModel_;
 
         Switch turbulence_;
+        Switch printCoeffs_;
         dictionary turbulenceModelCoeffs_;
 
         scalar kappa_;
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 62ee1e81dd..3f1e371f96 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -41,7 +41,10 @@ defineRunTimeSelectionTable(turbulenceModel, dictionary);
 
 void turbulenceModel::printCoeffs()
 {
-    Info<< turbulenceModelCoeffs_;
+    if (printCoeffs_)
+    {
+        Info<< turbulenceModelCoeffs_;
+    }
 }
 
 
@@ -75,16 +78,11 @@ turbulenceModel::turbulenceModel
     transportModel_(lamTransportModel),
 
     turbulence_(lookup("turbulence")),
+    printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
     turbulenceModelCoeffs_(subDict(type + "Coeffs")),
 
-    kappa_
-    (
-        dimensionedScalar(subDict("wallFunctionCoeffs").lookup("kappa")).value()
-    ),
-    E_
-    (
-        dimensionedScalar(subDict("wallFunctionCoeffs").lookup("E")).value()
-    ),
+    kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))),
+    E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))),
     yPlusLam_(yPlusLam(kappa_, E_)),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
index 7dc80b1cd9..a8bd512763 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
@@ -84,6 +84,7 @@ protected:
         transportModel& transportModel_;
 
         Switch turbulence_;
+        Switch printCoeffs_;
         dictionary turbulenceModelCoeffs_;
 
         scalar kappa_;