diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index 0ce675aad75f7022e0c3db53524163b0baab579f..b3a9440ebf562b7a626c6ad4e670a99bc9e6181d 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 a0231a02d572c6cce4b13b360e0edfa2232b1719..aab33e9e5bf88577d312529b77bfcda1a0026a1c 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