From 0cc201e2b8a7103eff6350c433699de86b1440fc Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Mon, 7 Jun 2021 17:49:22 +0100
Subject: [PATCH] ENH: turbulenceProperties: make turbulence switch optional
 (#2112)

---
 .../turbulenceModels/LES/LESModel/LESModel.C             | 9 ++-------
 .../turbulenceModels/RAS/RASModel/RASModel.C             | 8 ++------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 0ce675aad7..b3a9440ebf 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,12 +66,10 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
         transport,
         propertiesName
     ),
-
     LESDict_(this->subOrEmptyDict("LES")),
-    turbulence_(LESDict_.get<Switch>("turbulence")),
+    turbulence_(LESDict_.getOrDefault<Switch>("turbulence", true)),
     printCoeffs_(LESDict_.getOrDefault<Switch>("printCoeffs", false)),
     coeffDict_(LESDict_.optionalSubDict(type + "Coeffs")),
-
     kMin_
     (
         dimensioned<scalar>::getOrAddToDict
@@ -82,7 +80,6 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
             SMALL
         )
     ),
-
     epsilonMin_
     (
         dimensioned<scalar>::getOrAddToDict
@@ -93,7 +90,6 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
             SMALL
         )
     ),
-
     omegaMin_
     (
         dimensioned<scalar>::getOrAddToDict
@@ -104,7 +100,6 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
             SMALL
         )
     ),
-
     delta_
     (
         LESdelta::New
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index a0231a02d5..aab33e9e5b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,12 +66,10 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         transport,
         propertiesName
     ),
-
     RASDict_(this->subOrEmptyDict("RAS")),
-    turbulence_(RASDict_.get<Switch>("turbulence")),
+    turbulence_(RASDict_.getOrDefault<Switch>("turbulence", true)),
     printCoeffs_(RASDict_.getOrDefault<Switch>("printCoeffs", false)),
     coeffDict_(RASDict_.optionalSubDict(type + "Coeffs")),
-
     kMin_
     (
         dimensioned<scalar>::getOrAddToDict
@@ -82,7 +80,6 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
             SMALL
         )
     ),
-
     epsilonMin_
     (
         dimensioned<scalar>::getOrAddToDict
@@ -93,7 +90,6 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
             SMALL
         )
     ),
-
     omegaMin_
     (
         dimensioned<scalar>::getOrAddToDict