zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: turbulenceProperties: make turbulence switch optional (#2112)

Browse Source
This commit is contained in:
Kutalmis Bercin
2021-06-07 17:49:22 +01:00
committed by Andrew Heather
parent 348ae6f4be
commit 0cc201e2b8
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
View File

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

8
src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd. Copyright (C) 2019-2021 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -66,12 +66,10 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
transport, transport,
propertiesName propertiesName
), ),
RASDict_(this->subOrEmptyDict("RAS")), RASDict_(this->subOrEmptyDict("RAS")),
turbulence_(RASDict_.get<Switch>("turbulence")), turbulence_(RASDict_.getOrDefault<Switch>("turbulence", true)),
printCoeffs_(RASDict_.getOrDefault<Switch>("printCoeffs", false)), printCoeffs_(RASDict_.getOrDefault<Switch>("printCoeffs", false)),
coeffDict_(RASDict_.optionalSubDict(type + "Coeffs")), coeffDict_(RASDict_.optionalSubDict(type + "Coeffs")),
kMin_ kMin_
( (
dimensioned<scalar>::getOrAddToDict dimensioned<scalar>::getOrAddToDict
@ -82,7 +80,6 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
SMALL SMALL
) )
), ),
epsilonMin_ epsilonMin_
( (
dimensioned<scalar>::getOrAddToDict dimensioned<scalar>::getOrAddToDict
@ -93,7 +90,6 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
SMALL SMALL
) )
), ),
omegaMin_ omegaMin_
( (
dimensioned<scalar>::getOrAddToDict dimensioned<scalar>::getOrAddToDict