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: unify use of dictionary method names

Browse Source 
- previously introduced `getOrDefault` as a dictionary _get_ method,
  now complete the transition and use it everywhere instead of
  `lookupOrDefault`. This avoids mixed usage of the two methods that
  are identical in behaviour, makes for shorter names, and promotes
  the distinction between "lookup" access (ie, return a token stream,
  locate and return an entry) and "get" access (ie, the above with
  conversion to concrete types such as scalar, label etc).
This commit is contained in:
Mark Olesen
2020-06-02 16:38:55 +02:00
parent f721b5344f
commit 3e43edf056
624 changed files with 2109 additions and 1954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ODE/ODESolvers/ODESolver/ODESolver.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -65,9 +65,9 @@ Foam::ODESolver::ODESolver(const ODESystem& ode, const dictionary& dict)
odes_(ode),
maxN_(ode.nEqns()),
n_(ode.nEqns()),
absTol_(n_, dict.lookupOrDefault<scalar>("absTol", SMALL)),
relTol_(n_, dict.lookupOrDefault<scalar>("relTol", 1e-4)),
maxSteps_(dict.lookupOrDefault<label>("maxSteps", 10000))
absTol_(n_, dict.getOrDefault<scalar>("absTol", SMALL)),
relTol_(n_, dict.getOrDefault<scalar>("relTol", 1e-4)),
maxSteps_(dict.getOrDefault<label>("maxSteps", 10000))
{}

11
src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -36,11 +37,11 @@ Foam::adaptiveSolver::adaptiveSolver
const dictionary& dict
)
:
safeScale_(dict.lookupOrDefault<scalar>("safeScale", 0.9)),
alphaInc_(dict.lookupOrDefault<scalar>("alphaIncrease", 0.2)),
alphaDec_(dict.lookupOrDefault<scalar>("alphaDecrease", 0.25)),
minScale_(dict.lookupOrDefault<scalar>("minScale", 0.2)),
maxScale_(dict.lookupOrDefault<scalar>("maxScale", 10)),
safeScale_(dict.getOrDefault<scalar>("safeScale", 0.9)),
alphaInc_(dict.getOrDefault<scalar>("alphaIncrease", 0.2)),
alphaDec_(dict.getOrDefault<scalar>("alphaDecrease", 0.25)),
minScale_(dict.getOrDefault<scalar>("minScale", 0.2)),
maxScale_(dict.getOrDefault<scalar>("maxScale", 10)),
dydx0_(ode.nEqns()),
yTemp_(ode.nEqns())
{}

4
src/OpenFOAM/algorithms/indexedOctree/volumeType.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -53,7 +53,7 @@ Foam::volumeType::volumeType
const type deflt
)
:
t_(names.lookupOrDefault(key, dict, deflt))
t_(names.getOrDefault(key, dict, deflt))
{}

4
src/OpenFOAM/algorithms/indexedOctree/volumeType.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2014 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -101,7 +101,7 @@ public:
t_(t)
{}
//- Construct as lookupOrDefault by name from dictionary
//- Construct as getOrDefault by name from dictionary
volumeType(const word& key, const dictionary& dict, const type deflt);
//- Construct from integer

8
src/OpenFOAM/db/Time/Time.C
View File

@ -145,7 +145,7 @@ void Foam::Time::adjustDeltaT()
void Foam::Time::setControls()
{
// default is to resume calculation from "latestTime"
const word startFrom = controlDict_.lookupOrDefault<word>
const word startFrom = controlDict_.getOrDefault<word>
(
"startFrom",
"latestTime"
@ -290,7 +290,7 @@ void Foam::Time::setControls()
// Read and set the deltaT only if time-step adjustment is active
// otherwise use the deltaT from the controlDict
if (controlDict_.lookupOrDefault("adjustTimeStep", false))
if (controlDict_.getOrDefault("adjustTimeStep", false))
{
if (timeDict.readIfPresent("deltaT", deltaT_))
{
@ -379,7 +379,7 @@ void Foam::Time::setMonitoring(const bool forceProfiling)
else if
(
profilingDict
&& profilingDict->lookupOrDefault("active", true)
&& profilingDict->getOrDefault("active", true)
)
{
profiling::initialize
@ -999,7 +999,7 @@ bool Foam::Time::stopAt(const stopAtControls stopCtrl) const
bool Foam::Time::isAdjustTimeStep() const
{
return controlDict_.lookupOrDefault("adjustTimeStep", false);
return controlDict_.getOrDefault("adjustTimeStep", false);
}

12
src/OpenFOAM/db/dictionary/dictionary.H
View File

@ -1416,7 +1416,7 @@ public:
//- Deprecated(2018-10)
// \deprecated(2018-10) - use keyType::option version
template<class T>
FOAM_DEPRECATED_FOR(2018-10, "lookupOrDefault(keyType::option)")
FOAM_DEPRECATED_FOR(2018-10, "getOrDefault(keyType::option)")
T lookupOrDefault
(
const word& keyword,
@ -1425,15 +1425,13 @@ public:
bool patternMatch = true
) const
{
return
lookupOrDefault
(keyword, matchOpt(recursive, patternMatch));
return getOrDefault(keyword, matchOpt(recursive, patternMatch));
}
//- Deprecated(2018-10)
// \deprecated(2018-10) - use keyType::option version
template<class T>
FOAM_DEPRECATED_FOR(2018-10, "lookupOrAddDefault(keyType::option)")
FOAM_DEPRECATED_FOR(2018-10, "getOrAdd(keyType::option)")
T lookupOrAddDefault
(
const word& keyword,
@ -1442,9 +1440,7 @@ public:
bool patternMatch = true
)
{
return
lookupOrAddDefault
(keyword, deflt, matchOpt(recursive, patternMatch));
return getOrAdd(keyword, deflt, matchOpt(recursive, patternMatch));
}
//- Deprecated(2018-10)

4
src/OpenFOAM/db/dictionary/functionEntries/inputMode/inputMode.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenCFD Ltd.
Copyright (C) 2017-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -118,7 +118,7 @@ bool Foam::functionEntries::inputMode::execute
{
const word modeName(is);
// Like Enum::lookupOrDefault() with failsafe behaviour
// Like Enum::getOrDefault() with failsafe behaviour
if (selectableNames.found(modeName))
{
entry::globalInputMode = selectableNames.get(modeName);

4
src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2019 OpenCFD Ltd.
Copyright (C) 2017-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -138,7 +138,7 @@ bool Foam::functionObject::read(const dictionary& dict)
{
if (!postProcess)
{
log = dict.lookupOrDefault("log", true);
log = dict.getOrDefault("log", true);
}
return true;

2
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
View File

@ -797,7 +797,7 @@ bool Foam::functionObjectList::read()
const dictionary& dict = dEntry.dict();
bool enabled = dict.lookupOrDefault("enabled", true);
bool enabled = dict.getOrDefault("enabled", true);
newDigs[nFunc] = dict.digest();

10
src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -135,12 +135,12 @@ Foam::functionObjects::regionFunctionObject::regionFunctionObject
)
:
stateFunctionObject(name, runTime),
subRegistryName_(dict.lookupOrDefault<word>("subRegion", word::null)),
subRegistryName_(dict.getOrDefault<word>("subRegion", word::null)),
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
dict.getOrDefault("region", polyMesh::defaultRegion)
)
),
obrPtr_(nullptr)
@ -155,7 +155,7 @@ Foam::functionObjects::regionFunctionObject::regionFunctionObject
)
:
stateFunctionObject(name, obr.time()),
subRegistryName_(dict.lookupOrDefault<word>("subRegion", word::null)),
subRegistryName_(dict.getOrDefault<word>("subRegion", word::null)),
obr_(obr),
obrPtr_(nullptr)
{}
@ -167,7 +167,7 @@ bool Foam::functionObjects::regionFunctionObject::read(const dictionary& dict)
{
stateFunctionObject::read(dict);
subRegistryName_ = dict.lookupOrDefault<word>("subRegion", word::null);
subRegistryName_ = dict.getOrDefault<word>("subRegion", word::null);
obrPtr_ = nullptr;

6
src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -85,7 +85,7 @@ bool Foam::functionObjects::stateFunctionObject::setTrigger
IOdictionary& stateDict = this->stateDict();
label oldTriggeri =
stateDict.lookupOrDefault<label>("triggerIndex", labelMin);
stateDict.getOrDefault<label>("triggerIndex", labelMin);
if (triggeri > oldTriggeri)
{
@ -101,7 +101,7 @@ Foam::label Foam::functionObjects::stateFunctionObject::getTrigger() const
{
const IOdictionary& stateDict = this->stateDict();
return stateDict.lookupOrDefault<label>("triggerIndex", labelMin);
return stateDict.getOrDefault<label>("triggerIndex", labelMin);
}

8
src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2018 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -212,14 +212,14 @@ Foam::functionObjects::writeFile::writeFile
bool Foam::functionObjects::writeFile::read(const dictionary& dict)
{
writePrecision_ =
dict.lookupOrDefault("writePrecision", IOstream::defaultPrecision());
dict.getOrDefault("writePrecision", IOstream::defaultPrecision());
// Only write on master
writeToFile_ =
Pstream::master() && dict.lookupOrDefault("writeToFile", writeToFile_);
Pstream::master() && dict.getOrDefault("writeToFile", writeToFile_);
// Use user time, e.g. CA deg in preference to seconds
useUserTime_ = dict.lookupOrDefault("useUserTime", true);
useUserTime_ = dict.getOrDefault("useUserTime", true);
return true;
}

14
src/OpenFOAM/expressions/exprDriver/exprDriver.C
View File

@ -96,15 +96,15 @@ Foam::expressions::exprDriver::exprDriver
stashedTokenId_(0),
// Controls
debugScanner_(dict.lookupOrDefault("debugScanner", false)),
debugParser_(dict.lookupOrDefault("debugParser", false)),
debugScanner_(dict.getOrDefault("debugScanner", false)),
debugParser_(dict.getOrDefault("debugParser", false)),
allowShadowing_
(
dict.lookupOrDefault("allowShadowing", false)
dict.getOrDefault("allowShadowing", false)
),
prevIterIsOldTime_
(
dict.lookupOrDefault("prevIterIsOldTime", false)
dict.getOrDefault("prevIterIsOldTime", false)
),
cacheReadFields_(cacheReadFields),
searchInMemory_(searchInMemory || cacheReadFields),
@ -142,9 +142,9 @@ Foam::expressions::exprDriver::exprDriver
:
exprDriver
(
dict.lookupOrDefault("cacheReadFields", false),
dict.lookupOrDefault("searchInMemory", true),
dict.lookupOrDefault("searchFiles", false),
dict.getOrDefault("cacheReadFields", false),
dict.getOrDefault("searchInMemory", true),
dict.getOrDefault("searchFiles", false),
dict
)
{

4
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -985,7 +985,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
if
(
this->mesh().data::template lookupOrDefault<bool>
this->mesh().data::template getOrDefault<bool>
(
"finalIteration",
false

3
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -56,7 +57,7 @@ Foam::pointPatchField<Type>::pointPatchField
patch_(p),
internalField_(iF),
updated_(false),
patchType_(dict.lookupOrDefault<word>("patchType", word::null))
patchType_(dict.getOrDefault<word>("patchType", word::null))
{}

3
src/OpenFOAM/global/constants/dimensionedConstants.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -75,7 +76,7 @@ T dimensionedConstant
{
dictionary& groupDict = unitDict.subDict(group);
// Leaner version of dictionary lookupOrAddDefault()
// Leaner version of dictionary::getOrAdd()
// without writeOptionalEntries
if (groupDict.found(varName))

2
src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
View File

@ -46,7 +46,7 @@ namespace Foam
word fileOperation::defaultFileHandler
(
debug::optimisationSwitches().lookupOrAddDefault<word>
debug::optimisationSwitches().getOrAdd<word>
(
"fileHandler",
//Foam::fileOperations::uncollatedFileOperation::typeName,

6
src/OpenFOAM/global/profiling/profiling.C
View File

@ -266,17 +266,17 @@ Foam::profiling::profiling
times_(),
sysInfo_
(
dict.lookupOrDefault("sysInfo", false)
dict.getOrDefault("sysInfo", false)
? new profilingSysInfo() : nullptr
),
cpuInfo_
(
dict.lookupOrDefault("cpuInfo", false)
dict.getOrDefault("cpuInfo", false)
? new cpuInfo() : nullptr
),
memInfo_
(
dict.lookupOrDefault("memInfo", false)
dict.getOrDefault("memInfo", false)
? new memInfo() : nullptr
)
{

2
src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
View File

@ -96,7 +96,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
List<value_type>(),
bounding_
(
bounds::normalBoundingNames.lookupOrDefault
bounds::normalBoundingNames.getOrDefault
(
"outOfBounds",
dict,

2
src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
View File

@ -100,7 +100,7 @@ Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
List<value_type>(),
bounding_
(
bounds::repeatableBoundingNames.lookupOrDefault
bounds::repeatableBoundingNames.getOrDefault
(
"outOfBounds",
dict,

4
src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -36,7 +36,7 @@ Foam::autoPtr<Foam::tableReader<Type>> Foam::tableReader<Type>::New
const dictionary& spec
)
{
const word readerType = spec.lookupOrDefault<word>
const word readerType = spec.getOrDefault<word>
(
"readerType",
"openFoam"

5
src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -98,8 +99,8 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
List<scalar>(2, Zero),
x0_(dict.get<scalar>("x0")),
dx_(dict.get<scalar>("dx")),
log10_(dict.lookupOrDefault<Switch>("log10", false)),
bound_(dict.lookupOrDefault<Switch>("bound", false))
log10_(dict.getOrDefault<Switch>("log10", false)),
bound_(dict.getOrDefault<Switch>("bound", false))
{
if (initialiseOnly)
{

10
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -162,10 +162,10 @@ Foam::lduMatrix::solver::solver
void Foam::lduMatrix::solver::readControls()
{
maxIter_ = controlDict_.lookupOrDefault<label>("maxIter", defaultMaxIter_);
minIter_ = controlDict_.lookupOrDefault<label>("minIter", 0);
tolerance_ = controlDict_.lookupOrDefault<scalar>("tolerance", 1e-6);
relTol_ = controlDict_.lookupOrDefault<scalar>("relTol", 0);
maxIter_ = controlDict_.getOrDefault<label>("maxIter", defaultMaxIter_);
minIter_ = controlDict_.getOrDefault<label>("minIter", 0);
tolerance_ = controlDict_.getOrDefault<scalar>("tolerance", 1e-6);
relTol_ = controlDict_.getOrDefault<scalar>("relTol", 0);
}

4
src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -78,7 +78,7 @@ Foam::GAMGPreconditioner::~GAMGPreconditioner()
void Foam::GAMGPreconditioner::readControls()
{
GAMGSolver::readControls();
nVcycles_ = controlDict_.lookupOrDefault<label>("nVcycles", 2);
nVcycles_ = controlDict_.getOrDefault<label>("nVcycles", 2);
}

10
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -240,7 +240,7 @@ Foam::GAMGAgglomeration::GAMGAgglomeration
nCellsInCoarsestLevel_
(
controlDict.lookupOrDefault<label>("nCellsInCoarsestLevel", 10)
controlDict.getOrDefault<label>("nCellsInCoarsestLevel", 10)
),
meshInterfaces_(mesh.interfaces()),
procAgglomeratorPtr_
@ -305,7 +305,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
{
const word agglomeratorType
(
controlDict.lookupOrDefault<word>("agglomerator", "faceAreaPair")
controlDict.getOrDefault<word>("agglomerator", "faceAreaPair")
);
const_cast<Time&>(mesh.thisDb().time()).libs().open
@ -359,7 +359,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
{
const word agglomeratorType
(
controlDict.lookupOrDefault<word>("agglomerator", "faceAreaPair")
controlDict.getOrDefault<word>("agglomerator", "faceAreaPair")
);
const_cast<Time&>(mesh.thisDb().time()).libs().open
@ -405,7 +405,7 @@ Foam::autoPtr<Foam::GAMGAgglomeration> Foam::GAMGAgglomeration::New
{
const word agglomeratorType
(
controlDict.lookupOrDefault<word>("agglomerator", "faceAreaPair")
controlDict.getOrDefault<word>("agglomerator", "faceAreaPair")
);
const_cast<Time&>(mesh.thisDb().time()).libs().open

3
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -45,7 +46,7 @@ Foam::pairGAMGAgglomeration::pairGAMGAgglomeration
)
:
GAMGAgglomeration(mesh, controlDict),
mergeLevels_(controlDict.lookupOrDefault<label>("mergeLevels", 1))
mergeLevels_(controlDict.getOrDefault<label>("mergeLevels", 1))
{}

3
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -53,7 +54,7 @@ Foam::eagerGAMGProcAgglomeration::eagerGAMGProcAgglomeration
)
:
GAMGProcAgglomeration(agglom, controlDict),
mergeLevels_(controlDict.lookupOrDefault<label>("mergeLevels", 1))
mergeLevels_(controlDict.getOrDefault<label>("mergeLevels", 1))
{}

4
src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2014 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -75,7 +75,7 @@ Foam::smoothSolver::smoothSolver
void Foam::smoothSolver::readControls()
{
lduMatrix::solver::readControls();
nSweeps_ = controlDict_.lookupOrDefault<label>("nSweeps", 1);
nSweeps_ = controlDict_.getOrDefault<label>("nSweeps", 1);
}

8
src/OpenFOAM/matrices/solution/solution.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -50,7 +50,7 @@ void Foam::solution::read(const dictionary& dict)
if (dict.found("cache"))
{
cache_ = dict.subDict("cache");
caching_ = cache_.lookupOrDefault("active", true);
caching_ = cache_.getOrDefault("active", true);
}
if (dict.found("relaxationFactors"))
@ -92,10 +92,10 @@ void Foam::solution::read(const dictionary& dict)
}
fieldRelaxDefault_ =
fieldRelaxDict_.lookupOrDefault<scalar>("default", 0.0);
fieldRelaxDict_.getOrDefault<scalar>("default", 0);
eqnRelaxDefault_ =
eqnRelaxDict_.lookupOrDefault<scalar>("default", 0.0);
eqnRelaxDict_.getOrDefault<scalar>("default", 0);
DebugInfo
<< "Relaxation factors:" << nl

5
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -500,10 +501,10 @@ Foam::coupledPolyPatch::coupledPolyPatch
)
:
polyPatch(name, dict, index, bm, patchType),
matchTolerance_(dict.lookupOrDefault("matchTolerance", defaultMatchTol_)),
matchTolerance_(dict.getOrDefault("matchTolerance", defaultMatchTol_)),
transform_
(
transformTypeNames.lookupOrDefault
transformTypeNames.getOrDefault
(
"transform",
dict,

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -652,7 +652,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
)
:
coupledPolyPatch(name, dict, index, bm, patchType),
neighbPatchName_(dict.lookupOrDefault("neighbourPatch", word::null)),
neighbPatchName_(dict.getOrDefault("neighbourPatch", word::null)),
coupleGroup_(dict),
neighbPatchID_(-1),
rotationAxis_(Zero),

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
View File

@ -84,7 +84,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
:
processorPolyPatch(name, dict, index, bm, patchType),
referPatchName_(dict.lookup("referPatch")),
tag_(dict.lookupOrDefault<int>("tag", -1)),
tag_(dict.getOrDefault<int>("tag", -1)),
referPatchID_(-1)
{}

4
src/OpenFOAM/orientedType/orientedType.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017-2019 OpenCFD Ltd.
Copyright (C) 2017-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -106,7 +106,7 @@ void Foam::orientedType::setOriented(const bool oriented)
void Foam::orientedType::read(const dictionary& dict)
{
oriented_ = orientedOptionNames.lookupOrDefault
oriented_ = orientedOptionNames.getOrDefault
(
"oriented",
dict,

4
src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 OpenFOAM Foundation
Copyright (C) 2016 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -33,7 +33,7 @@ License
template<class Type>
void Foam::Function1Types::Sine<Type>::read(const dictionary& coeffs)
{
t0_ = coeffs.lookupOrDefault<scalar>("t0", 0);
t0_ = coeffs.getOrDefault<scalar>("t0", 0);
amplitude_ = Function1<scalar>::New("amplitude", coeffs);
frequency_ = Function1<scalar>::New("frequency", coeffs);
scale_ = Function1<Type>::New("scale", coeffs);

4
src/OpenFOAM/primitives/subModelBase/subModelBase.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -142,7 +142,7 @@ const Foam::dictionary& Foam::subModelBase::properties() const
bool Foam::subModelBase::defaultCoeffs(const bool printMsg) const
{
bool def = coeffDict_.lookupOrDefault("defaultCoeffs", false);
bool def = coeffDict_.getOrDefault("defaultCoeffs", false);
if (printMsg && def)
{
Info<< incrIndent;

4
src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2014-2015 OpenFOAM Foundation
Copyright (C) 2018-2019 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -67,7 +67,7 @@ buoyantKEpsilon<BasicTurbulenceModel>::buoyantKEpsilon
Cg_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cg",
this->coeffDict_,

16
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -64,15 +64,15 @@ outletMachNumberPressureFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
M_(dict.lookupOrDefault<scalar>("M", 0)),
M_(dict.getOrDefault<scalar>("M", 0)),
pBack_(dict.get<scalar>("pBack")),
c1_(dict.lookupOrDefault<scalar>("c1", 0)),
A1_(dict.lookupOrDefault<scalar>("A1", 0)),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
UName_(dict.lookupOrDefault<word>("U", "U")),
c1_(dict.getOrDefault<scalar>("c1", 0)),
A1_(dict.getOrDefault<scalar>("A1", 0)),
phiName_(dict.getOrDefault<word>("phi", "phi")),
rhoName_(dict.getOrDefault<word>("rho", "rho")),
UName_(dict.getOrDefault<word>("U", "U")),
choked_(dict.get<Switch>("choked")),
relax_(dict.lookupOrDefault<scalar>("relax", 0))
relax_(dict.getOrDefault<scalar>("relax", 0))
{}

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -77,10 +77,10 @@ outletMappedUniformInletHeatAdditionFvPatchField
:
fixedValueFvPatchScalarField(p, iF, dict),
outletPatchName_(dict.get<word>("outletPatch")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
phiName_(dict.getOrDefault<word>("phi", "phi")),
Q_(dict.get<scalar>("Q")),
TMin_(dict.lookupOrDefault<scalar>("TMin", 0)),
TMax_(dict.lookupOrDefault<scalar>("TMax", 5000))
TMin_(dict.getOrDefault<scalar>("TMin", 0)),
TMax_(dict.getOrDefault<scalar>("TMax", 5000))
{}

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2019 OpenCFD Ltd.
Copyright (C) 2017-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -74,9 +74,9 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
:
patch_(patch),
method_(KMethodTypeNames_.get("kappaMethod", dict)),
kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
alphaAniName_(dict.lookupOrDefault<word>("alphaAni","none")),
alphaName_(dict.lookupOrDefault<word>("alpha","none"))
kappaName_(dict.getOrDefault<word>("kappa", "none")),
alphaAniName_(dict.getOrDefault<word>("alphaAni", "none")),
alphaName_(dict.getOrDefault<word>("alpha", "none"))
{
switch (method_)
{

7
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -97,7 +98,7 @@ thermalBaffle1DFvPatchScalarField
mappedPatchBase(p.patch(), NEARESTPATCHFACE, dict),
mixedFvPatchScalarField(p, iF),
TName_("T"),
baffleActivated_(dict.lookupOrDefault("baffleActivated", true)),
baffleActivated_(dict.getOrDefault("baffleActivated", true)),
thickness_(),
qs_(p.size(), 0),
solidDict_(dict),
@ -105,9 +106,9 @@ thermalBaffle1DFvPatchScalarField
qrPrevious_(p.size(), Zero),
qrRelaxation_
(
dict.lookupOrDefaultCompat("qrRelaxation", {{"relaxation", 1712}}, 1)
dict.getOrDefaultCompat("qrRelaxation", {{"relaxation", 1712}}, 1)
),
qrName_(dict.lookupOrDefault<word>("qr", "none"))
qrName_(dict.getOrDefault<word>("qr", "none"))
{
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -62,9 +62,9 @@ totalFlowRateAdvectiveDiffusiveFvPatchScalarField
)
:
mixedFvPatchField<scalar>(p, iF),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "none")),
massFluxFraction_(dict.lookupOrDefault<scalar>("massFluxFraction", 1.0))
phiName_(dict.getOrDefault<word>("phi", "phi")),
rhoName_(dict.getOrDefault<word>("rho", "none")),
massFluxFraction_(dict.getOrDefault<scalar>("massFluxFraction", 1))
{
refValue() = 1.0;

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
View File

@ -103,13 +103,13 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
:
mixedFvPatchScalarField(p, iF),
temperatureCoupledBase(patch(), dict),
TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
qrNbrName_(dict.lookupOrDefault<word>("qrNbr", "none")),
qrName_(dict.lookupOrDefault<word>("qr", "none")),
TnbrName_(dict.getOrDefault<word>("Tnbr", "T")),
qrNbrName_(dict.getOrDefault<word>("qrNbr", "none")),
qrName_(dict.getOrDefault<word>("qr", "none")),
thicknessLayers_(0),
kappaLayers_(0),
contactRes_(0.0),
thermalInertia_(dict.lookupOrDefault<Switch>("thermalInertia", false))
thermalInertia_(dict.getOrDefault<Switch>("thermalInertia", false))
{
if (!isA<mappedPatchBase>(this->patch().patch()))
{

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017 OpenCFD Ltd
Copyright (C) 2017-2020 OpenCFD Ltd
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -175,9 +175,9 @@ alphatJayatillekeWallFunctionFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8))
Prt_(dict.getOrDefault<scalar>("Prt", 0.85)),
kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
E_(dict.getOrDefault<scalar>("E", 9.8))
{
checkType();
}

3
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -72,7 +73,7 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
Prt_(dict.getOrDefault<scalar>("Prt", 0.85))
{}

10
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -115,7 +115,7 @@ LamBremhorstKE::LamBremhorstKE
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
coeffDict_,
@ -124,7 +124,7 @@ LamBremhorstKE::LamBremhorstKE
),
Ceps1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps1",
coeffDict_,
@ -133,7 +133,7 @@ LamBremhorstKE::LamBremhorstKE
),
Ceps2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps2",
coeffDict_,
@ -142,7 +142,7 @@ LamBremhorstKE::LamBremhorstKE
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaEps",
coeffDict_,

36
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -148,7 +148,7 @@ LienCubicKE::LienCubicKE
Ceps1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps1",
coeffDict_,
@ -157,7 +157,7 @@ LienCubicKE::LienCubicKE
),
Ceps2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps2",
coeffDict_,
@ -166,7 +166,7 @@ LienCubicKE::LienCubicKE
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
coeffDict_,
@ -175,7 +175,7 @@ LienCubicKE::LienCubicKE
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
coeffDict_,
@ -184,7 +184,7 @@ LienCubicKE::LienCubicKE
),
Cmu1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu1",
coeffDict_,
@ -193,7 +193,7 @@ LienCubicKE::LienCubicKE
),
Cmu2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu2",
coeffDict_,
@ -202,7 +202,7 @@ LienCubicKE::LienCubicKE
),
Cbeta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta",
coeffDict_,
@ -211,7 +211,7 @@ LienCubicKE::LienCubicKE
),
Cbeta1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta1",
coeffDict_,
@ -220,7 +220,7 @@ LienCubicKE::LienCubicKE
),
Cbeta2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta2",
coeffDict_,
@ -229,7 +229,7 @@ LienCubicKE::LienCubicKE
),
Cbeta3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta3",
coeffDict_,
@ -238,7 +238,7 @@ LienCubicKE::LienCubicKE
),
Cgamma1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cgamma1",
coeffDict_,
@ -247,7 +247,7 @@ LienCubicKE::LienCubicKE
),
Cgamma2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cgamma2",
coeffDict_,
@ -256,7 +256,7 @@ LienCubicKE::LienCubicKE
),
Cgamma4_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cgamma4",
coeffDict_,
@ -265,7 +265,7 @@ LienCubicKE::LienCubicKE
),
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
coeffDict_,
@ -274,7 +274,7 @@ LienCubicKE::LienCubicKE
),
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
coeffDict_,
@ -283,7 +283,7 @@ LienCubicKE::LienCubicKE
),
Anu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Anu",
coeffDict_,
@ -292,7 +292,7 @@ LienCubicKE::LienCubicKE
),
AE_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"AE",
coeffDict_,

20
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -114,7 +114,7 @@ LienLeschziner::LienLeschziner
Ceps1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps1",
coeffDict_,
@ -123,7 +123,7 @@ LienLeschziner::LienLeschziner
),
Ceps2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps2",
coeffDict_,
@ -132,7 +132,7 @@ LienLeschziner::LienLeschziner
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
coeffDict_,
@ -141,7 +141,7 @@ LienLeschziner::LienLeschziner
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
coeffDict_,
@ -150,7 +150,7 @@ LienLeschziner::LienLeschziner
),
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
coeffDict_,
@ -159,7 +159,7 @@ LienLeschziner::LienLeschziner
),
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
coeffDict_,
@ -168,7 +168,7 @@ LienLeschziner::LienLeschziner
),
Anu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Anu",
coeffDict_,
@ -177,7 +177,7 @@ LienLeschziner::LienLeschziner
),
Aeps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Aeps",
coeffDict_,
@ -186,7 +186,7 @@ LienLeschziner::LienLeschziner
),
AE_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"AE",
coeffDict_,

22
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -105,7 +105,7 @@ ShihQuadraticKE::ShihQuadraticKE
Ceps1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps1",
coeffDict_,
@ -114,7 +114,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Ceps2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps2",
coeffDict_,
@ -123,7 +123,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
coeffDict_,
@ -132,7 +132,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
coeffDict_,
@ -141,7 +141,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Cmu1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu1",
coeffDict_,
@ -150,7 +150,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Cmu2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu2",
coeffDict_,
@ -159,7 +159,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Cbeta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta",
coeffDict_,
@ -168,7 +168,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Cbeta1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta1",
coeffDict_,
@ -177,7 +177,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Cbeta2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta2",
coeffDict_,
@ -186,7 +186,7 @@ ShihQuadraticKE::ShihQuadraticKE
),
Cbeta3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cbeta3",
coeffDict_,

56
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -248,7 +248,7 @@ kkLOmega::kkLOmega
A0_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"A0",
coeffDict_,
@ -257,7 +257,7 @@ kkLOmega::kkLOmega
),
As_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"As",
coeffDict_,
@ -266,7 +266,7 @@ kkLOmega::kkLOmega
),
Av_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Av",
coeffDict_,
@ -275,7 +275,7 @@ kkLOmega::kkLOmega
),
Abp_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Abp",
coeffDict_,
@ -284,7 +284,7 @@ kkLOmega::kkLOmega
),
Anat_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Anat",
coeffDict_,
@ -293,7 +293,7 @@ kkLOmega::kkLOmega
),
Ats_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ats",
coeffDict_,
@ -302,7 +302,7 @@ kkLOmega::kkLOmega
),
CbpCrit_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CbpCrit",
coeffDict_,
@ -311,7 +311,7 @@ kkLOmega::kkLOmega
),
Cnc_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cnc",
coeffDict_,
@ -320,7 +320,7 @@ kkLOmega::kkLOmega
),
CnatCrit_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CnatCrit",
coeffDict_,
@ -329,7 +329,7 @@ kkLOmega::kkLOmega
),
Cint_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cint",
coeffDict_,
@ -338,7 +338,7 @@ kkLOmega::kkLOmega
),
CtsCrit_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CtsCrit",
coeffDict_,
@ -347,7 +347,7 @@ kkLOmega::kkLOmega
),
CrNat_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CrNat",
coeffDict_,
@ -356,7 +356,7 @@ kkLOmega::kkLOmega
),
C11_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C11",
coeffDict_,
@ -365,7 +365,7 @@ kkLOmega::kkLOmega
),
C12_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C12",
coeffDict_,
@ -374,7 +374,7 @@ kkLOmega::kkLOmega
),
CR_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CR",
coeffDict_,
@ -383,7 +383,7 @@ kkLOmega::kkLOmega
),
CalphaTheta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CalphaTheta",
coeffDict_,
@ -392,7 +392,7 @@ kkLOmega::kkLOmega
),
Css_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Css",
coeffDict_,
@ -401,7 +401,7 @@ kkLOmega::kkLOmega
),
CtauL_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CtauL",
coeffDict_,
@ -410,7 +410,7 @@ kkLOmega::kkLOmega
),
Cw1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw1",
coeffDict_,
@ -419,7 +419,7 @@ kkLOmega::kkLOmega
),
Cw2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw2",
coeffDict_,
@ -428,7 +428,7 @@ kkLOmega::kkLOmega
),
Cw3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw3",
coeffDict_,
@ -437,7 +437,7 @@ kkLOmega::kkLOmega
),
CwR_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CwR",
coeffDict_,
@ -446,7 +446,7 @@ kkLOmega::kkLOmega
),
Clambda_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Clambda",
coeffDict_,
@ -455,7 +455,7 @@ kkLOmega::kkLOmega
),
CmuStd_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CmuStd",
coeffDict_,
@ -464,7 +464,7 @@ kkLOmega::kkLOmega
),
Prtheta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Prtheta",
coeffDict_,
@ -473,7 +473,7 @@ kkLOmega::kkLOmega
),
Sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Sigmak",
coeffDict_,
@ -482,7 +482,7 @@ kkLOmega::kkLOmega
),
Sigmaw_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Sigmaw",
coeffDict_,

12
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -105,7 +105,7 @@ qZeta::qZeta
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
coeffDict_,
@ -114,7 +114,7 @@ qZeta::qZeta
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
coeffDict_,
@ -123,7 +123,7 @@ qZeta::qZeta
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
coeffDict_,
@ -132,7 +132,7 @@ qZeta::qZeta
),
sigmaZeta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaZeta",
coeffDict_,
@ -141,7 +141,7 @@ qZeta::qZeta
),
anisotropic_
(
Switch::lookupOrAddToDict
Switch::getOrAddToDict
(
"anisotropic",
coeffDict_,

6
src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017 OpenCFD Ltd
Copyright (C) 2017-2020 OpenCFD Ltd
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -179,8 +179,8 @@ alphatJayatillekeWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF, dict),
Prt_(dict.get<scalar>("Prt")), // force read to avoid ambiguity
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8))
kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
E_(dict.getOrDefault<scalar>("E", 9.8))
{
checkType();
}

8
src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -69,7 +69,7 @@ NicenoKEqn<BasicTurbulenceModel>::NicenoKEqn
alphaInversion_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaInversion",
this->coeffDict_,
@ -79,7 +79,7 @@ NicenoKEqn<BasicTurbulenceModel>::NicenoKEqn
Cp_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cp",
this->coeffDict_,
@ -89,7 +89,7 @@ NicenoKEqn<BasicTurbulenceModel>::NicenoKEqn
Cmub_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmub",
this->coeffDict_,

4
src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -67,7 +67,7 @@ SmagorinskyZhang<BasicTurbulenceModel>::SmagorinskyZhang
Cmub_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmub",
this->coeffDict_,

4
src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -67,7 +67,7 @@ continuousGasKEqn<BasicTurbulenceModel>::continuousGasKEqn
alphaInversion_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaInversion",
this->coeffDict_,

10
src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -69,7 +69,7 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
alphaInversion_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaInversion",
this->coeffDict_,
@ -79,7 +79,7 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
Cp_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cp",
this->coeffDict_,
@ -89,7 +89,7 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
C3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3",
this->coeffDict_,
@ -99,7 +99,7 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
Cmub_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmub",
this->coeffDict_,

4
src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -83,7 +83,7 @@ continuousGasKEpsilon<BasicTurbulenceModel>::continuousGasKEpsilon
alphaInversion_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaInversion",
this->coeffDict_,

4
src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2014-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -68,7 +68,7 @@ kOmegaSSTSato<BasicTurbulenceModel>::kOmegaSSTSato
Cmub_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmub",
this->coeffDict_,

15
src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -73,7 +74,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
this->coeffDict_,
@ -82,7 +83,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
this->coeffDict_,
@ -91,7 +92,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -100,7 +101,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
),
C3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3",
this->coeffDict_,
@ -109,7 +110,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
),
Cp_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cp",
this->coeffDict_,
@ -118,7 +119,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
this->coeffDict_,
@ -127,7 +128,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
this->coeffDict_,

32
src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
View File

@ -246,7 +246,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
alphaK1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaK1",
this->coeffDict_,
@ -255,7 +255,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
alphaK2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaK2",
this->coeffDict_,
@ -264,7 +264,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
alphaOmega1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaOmega1",
this->coeffDict_,
@ -273,7 +273,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
alphaOmega2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaOmega2",
this->coeffDict_,
@ -282,7 +282,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
gamma1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"gamma1",
this->coeffDict_,
@ -291,7 +291,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
gamma2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"gamma2",
this->coeffDict_,
@ -300,7 +300,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
beta1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"beta1",
this->coeffDict_,
@ -309,7 +309,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
beta2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"beta2",
this->coeffDict_,
@ -318,7 +318,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
betaStar_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"betaStar",
this->coeffDict_,
@ -327,7 +327,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
a1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"a1",
this->coeffDict_,
@ -336,7 +336,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
b1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"b1",
this->coeffDict_,
@ -345,7 +345,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
c1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"c1",
this->coeffDict_,
@ -354,7 +354,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
F3_
(
Switch::lookupOrAddToDict
Switch::getOrAddToDict
(
"F3",
this->coeffDict_,
@ -390,7 +390,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
decayControl_
(
Switch::lookupOrAddToDict
Switch::getOrAddToDict
(
"decayControl",
this->coeffDict_,
@ -399,7 +399,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
kInf_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kInf",
this->coeffDict_,
@ -409,7 +409,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
),
omegaInf_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"omegaInf",
this->coeffDict_,

6
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -131,7 +131,7 @@ SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
Cd1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cd1",
this->coeffDict_,
@ -140,7 +140,7 @@ SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
),
Cd2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cd2",
this->coeffDict_,

30
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -263,7 +263,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
sigmaNut_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaNut",
this->coeffDict_,
@ -272,7 +272,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
this->coeffDict_,
@ -281,7 +281,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Cb1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cb1",
this->coeffDict_,
@ -290,7 +290,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Cb2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cb2",
this->coeffDict_,
@ -300,7 +300,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
Cw2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw2",
this->coeffDict_,
@ -309,7 +309,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Cw3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw3",
this->coeffDict_,
@ -318,7 +318,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Cv1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cv1",
this->coeffDict_,
@ -327,7 +327,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Cs_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cs",
this->coeffDict_,
@ -336,7 +336,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
CDES_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CDES",
this->coeffDict_,
@ -345,7 +345,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
ck_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"ck",
this->coeffDict_,
@ -354,7 +354,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
lowReCorrection_
(
Switch::lookupOrAddToDict
Switch::getOrAddToDict
(
"lowReCorrection",
this->coeffDict_,
@ -363,7 +363,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Ct3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ct3",
this->coeffDict_,
@ -372,7 +372,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
Ct4_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ct4",
this->coeffDict_,
@ -381,7 +381,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
),
fwStar_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"fwStar",
this->coeffDict_,

10
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -189,7 +189,7 @@ SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
Cdt1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cdt1",
this->coeffDict_,
@ -198,7 +198,7 @@ SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
),
Cdt2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cdt2",
this->coeffDict_,
@ -207,7 +207,7 @@ SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
),
Cl_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cl",
this->coeffDict_,
@ -216,7 +216,7 @@ SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
),
Ct_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ct",
this->coeffDict_,

6
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -133,7 +133,7 @@ kOmegaSSTDDES<BasicTurbulenceModel>::kOmegaSSTDDES
Cd1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cd1",
this->coeffDict_,
@ -142,7 +142,7 @@ kOmegaSSTDDES<BasicTurbulenceModel>::kOmegaSSTDDES
),
Cd2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cd2",
this->coeffDict_,

8
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -122,7 +122,7 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
this->coeffDict_,
@ -131,7 +131,7 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
),
CDESkom_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CDESkom",
this->coeffDict_,
@ -140,7 +140,7 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
),
CDESkeps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"CDESkeps",
this->coeffDict_,

10
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -188,7 +188,7 @@ kOmegaSSTIDDES<BasicTurbulenceModel>::kOmegaSSTIDDES
Cdt1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cdt1",
this->coeffDict_,
@ -197,7 +197,7 @@ kOmegaSSTIDDES<BasicTurbulenceModel>::kOmegaSSTIDDES
),
Cdt2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cdt2",
this->coeffDict_,
@ -206,7 +206,7 @@ kOmegaSSTIDDES<BasicTurbulenceModel>::kOmegaSSTIDDES
),
Cl_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cl",
this->coeffDict_,
@ -215,7 +215,7 @@ kOmegaSSTIDDES<BasicTurbulenceModel>::kOmegaSSTIDDES
),
Ct_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ct",
this->coeffDict_,

8
src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
View File

@ -78,7 +78,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
Ck_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ck",
this->coeffDict_,
@ -87,7 +87,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
),
Cm_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cm",
this->coeffDict_,
@ -96,7 +96,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
),
Ce_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ce",
this->coeffDict_,
@ -105,7 +105,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
),
Cs_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cs",
this->coeffDict_,

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

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -69,12 +69,12 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
LESDict_(this->subOrEmptyDict("LES")),
turbulence_(LESDict_.get<Switch>("turbulence")),
printCoeffs_(LESDict_.lookupOrDefault<Switch>("printCoeffs", false)),
printCoeffs_(LESDict_.getOrDefault<Switch>("printCoeffs", false)),
coeffDict_(LESDict_.optionalSubDict(type + "Coeffs")),
kMin_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kMin",
LESDict_,
@ -85,7 +85,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
epsilonMin_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"epsilonMin",
LESDict_,
@ -96,7 +96,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
omegaMin_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"omegaMin",
LESDict_,

4
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2016-2017 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -150,7 +150,7 @@ Foam::LESModels::IDDESDelta::IDDESDelta
hmaxPtr_(nullptr),
Cw_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<scalar>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<scalar>
(
"Cw",
0.15

5
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -72,10 +73,10 @@ Foam::LESModels::PrandtlDelta::PrandtlDelta
dict.optionalSubDict(type() + "Coeffs")
)
),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
Cdelta_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<scalar>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<scalar>
(
"Cdelta",
0.158

4
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2016 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -100,7 +100,7 @@ Foam::LESModels::cubeRootVolDelta::cubeRootVolDelta
LESdelta(name, turbulence),
deltaCoeff_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<scalar>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<scalar>
(
"deltaCoeff",
1

4
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2016 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -113,7 +113,7 @@ Foam::LESModels::maxDeltaxyz::maxDeltaxyz
LESdelta(name, turbulence),
deltaCoeff_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<scalar>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<scalar>
(
"deltaCoeff",
2

9
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -116,10 +117,10 @@ Foam::LESModels::vanDriestDelta::vanDriestDelta
dict.subDict(type() + "Coeffs")
)
),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
Aplus_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<scalar>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<scalar>
(
"Aplus",
26.0
@ -127,7 +128,7 @@ Foam::LESModels::vanDriestDelta::vanDriestDelta
),
Cdelta_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<scalar>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<scalar>
(
"Cdelta",
0.158
@ -135,7 +136,7 @@ Foam::LESModels::vanDriestDelta::vanDriestDelta
),
calcInterval_
(
dict.optionalSubDict(type() + "Coeffs").lookupOrDefault<label>
dict.optionalSubDict(type() + "Coeffs").getOrDefault<label>
(
"calcInterval",
1

2
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -65,7 +65,7 @@ LESeddyViscosity<BasicTurbulenceModel>::LESeddyViscosity
Ce_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ce",
this->coeffDict_,

2
src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
View File

@ -108,7 +108,7 @@ Smagorinsky<BasicTurbulenceModel>::Smagorinsky
Ck_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ck",
this->coeffDict_,

4
src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
View File

@ -128,7 +128,7 @@ WALE<BasicTurbulenceModel>::WALE
Ck_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ck",
this->coeffDict_,
@ -138,7 +138,7 @@ WALE<BasicTurbulenceModel>::WALE
Cw_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw",
this->coeffDict_,

4
src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -112,7 +112,7 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
),
theta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"theta",
this->coeffDict_,

2
src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
View File

@ -106,7 +106,7 @@ kEqn<BasicTurbulenceModel>::kEqn
Ck_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ck",
this->coeffDict_,

24
src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -79,7 +79,7 @@ LRR<BasicTurbulenceModel>::LRR
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
this->coeffDict_,
@ -88,7 +88,7 @@ LRR<BasicTurbulenceModel>::LRR
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
this->coeffDict_,
@ -97,7 +97,7 @@ LRR<BasicTurbulenceModel>::LRR
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -106,7 +106,7 @@ LRR<BasicTurbulenceModel>::LRR
),
Ceps1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps1",
this->coeffDict_,
@ -115,7 +115,7 @@ LRR<BasicTurbulenceModel>::LRR
),
Ceps2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps2",
this->coeffDict_,
@ -124,7 +124,7 @@ LRR<BasicTurbulenceModel>::LRR
),
Cs_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cs",
this->coeffDict_,
@ -133,7 +133,7 @@ LRR<BasicTurbulenceModel>::LRR
),
Ceps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps",
this->coeffDict_,
@ -143,7 +143,7 @@ LRR<BasicTurbulenceModel>::LRR
wallReflection_
(
Switch::lookupOrAddToDict
Switch::getOrAddToDict
(
"wallReflection",
this->coeffDict_,
@ -152,7 +152,7 @@ LRR<BasicTurbulenceModel>::LRR
),
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
this->coeffDict_,
@ -161,7 +161,7 @@ LRR<BasicTurbulenceModel>::LRR
),
Cref1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cref1",
this->coeffDict_,
@ -170,7 +170,7 @@ LRR<BasicTurbulenceModel>::LRR
),
Cref2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cref2",
this->coeffDict_,

14
src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -125,7 +125,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
this->coeffDict_,
@ -134,7 +134,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
this->coeffDict_,
@ -143,7 +143,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -152,7 +152,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
),
C3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3",
this->coeffDict_,
@ -161,7 +161,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
this->coeffDict_,
@ -170,7 +170,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
this->coeffDict_,

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

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -69,12 +69,12 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
RASDict_(this->subOrEmptyDict("RAS")),
turbulence_(RASDict_.get<Switch>("turbulence")),
printCoeffs_(RASDict_.lookupOrDefault<Switch>("printCoeffs", false)),
printCoeffs_(RASDict_.getOrDefault<Switch>("printCoeffs", false)),
coeffDict_(RASDict_.optionalSubDict(type + "Coeffs")),
kMin_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kMin",
RASDict_,
@ -85,7 +85,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
epsilonMin_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"epsilonMin",
RASDict_,
@ -96,7 +96,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
omegaMin_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"omegaMin",
RASDict_,

18
src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -109,7 +109,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
this->coeffDict_,
@ -118,7 +118,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
this->coeffDict_,
@ -127,7 +127,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -136,7 +136,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
C3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3",
this->coeffDict_,
@ -145,7 +145,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
this->coeffDict_,
@ -154,7 +154,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
this->coeffDict_,
@ -163,7 +163,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
eta0_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"eta0",
this->coeffDict_,
@ -172,7 +172,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
),
beta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"beta",
this->coeffDict_,

26
src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015-2016 OpenFOAM Foundation
Copyright (C) 2018-2019 OpenCFD Ltd
Copyright (C) 2018-2020 OpenCFD Ltd
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -79,7 +79,7 @@ SSG<BasicTurbulenceModel>::SSG
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
this->coeffDict_,
@ -88,7 +88,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
this->coeffDict_,
@ -97,7 +97,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C1s_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1s",
this->coeffDict_,
@ -106,7 +106,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -115,7 +115,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3",
this->coeffDict_,
@ -124,7 +124,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C3s_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3s",
this->coeffDict_,
@ -133,7 +133,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C4_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C4",
this->coeffDict_,
@ -142,7 +142,7 @@ SSG<BasicTurbulenceModel>::SSG
),
C5_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C5",
this->coeffDict_,
@ -152,7 +152,7 @@ SSG<BasicTurbulenceModel>::SSG
Ceps1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps1",
this->coeffDict_,
@ -161,7 +161,7 @@ SSG<BasicTurbulenceModel>::SSG
),
Ceps2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps2",
this->coeffDict_,
@ -170,7 +170,7 @@ SSG<BasicTurbulenceModel>::SSG
),
Cs_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cs",
this->coeffDict_,
@ -179,7 +179,7 @@ SSG<BasicTurbulenceModel>::SSG
),
Ceps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Ceps",
this->coeffDict_,

16
src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
View File

@ -170,7 +170,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
sigmaNut_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaNut",
this->coeffDict_,
@ -179,7 +179,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
),
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
this->coeffDict_,
@ -189,7 +189,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
Cb1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cb1",
this->coeffDict_,
@ -198,7 +198,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
),
Cb2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cb2",
this->coeffDict_,
@ -208,7 +208,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
Cw2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw2",
this->coeffDict_,
@ -217,7 +217,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
),
Cw3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cw3",
this->coeffDict_,
@ -226,7 +226,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
),
Cv1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cv1",
this->coeffDict_,
@ -235,7 +235,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
),
Cs_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cs",
this->coeffDict_,

7
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -81,9 +82,9 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
:
inletOutletFvPatchScalarField(p, iF),
mixingLength_(dict.get<scalar>("mixingLength")),
kName_(dict.lookupOrDefault<word>("k", "k"))
kName_(dict.getOrDefault<word>("k", "k"))
{
this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
this->phiName_ = dict.getOrDefault<word>("phi", "phi");
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
@ -138,7 +139,7 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
);
const scalar Cmu =
turbModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
turbModel.coeffDict().getOrDefault<scalar>("Cmu", 0.09);
const scalar Cmu75 = pow(Cmu, 0.75);

7
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -79,9 +80,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
:
inletOutletFvPatchScalarField(p, iF),
mixingLength_(dict.get<scalar>("mixingLength")),
kName_(dict.lookupOrDefault<word>("k", "k"))
kName_(dict.getOrDefault<word>("k", "k"))
{
this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
this->phiName_ = dict.getOrDefault<word>("phi", "phi");
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
@ -134,7 +135,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
);
const scalar Cmu =
turbModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
turbModel.coeffDict().getOrDefault<scalar>("Cmu", 0.09);
const scalar Cmu25 = pow(Cmu, 0.25);

14
src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -109,7 +109,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cmu",
this->coeffDict_,
@ -118,7 +118,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
),
C1_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C1",
this->coeffDict_,
@ -127,7 +127,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -136,7 +136,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
),
C3_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C3",
this->coeffDict_,
@ -145,7 +145,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
this->coeffDict_,
@ -154,7 +154,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
this->coeffDict_,

12
src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -79,7 +79,7 @@ kOmega<BasicTurbulenceModel>::kOmega
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"betaStar",
this->coeffDict_,
@ -88,7 +88,7 @@ kOmega<BasicTurbulenceModel>::kOmega
),
beta_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"beta",
this->coeffDict_,
@ -97,7 +97,7 @@ kOmega<BasicTurbulenceModel>::kOmega
),
gamma_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"gamma",
this->coeffDict_,
@ -106,7 +106,7 @@ kOmega<BasicTurbulenceModel>::kOmega
),
alphaK_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaK",
this->coeffDict_,
@ -115,7 +115,7 @@ kOmega<BasicTurbulenceModel>::kOmega
),
alphaOmega_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"alphaOmega",
this->coeffDict_,

18
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -387,7 +387,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
ca1_
(
dimensionedScalar::lookupOrAddToDict
dimensionedScalar::getOrAddToDict
(
"ca1",
this->coeffDict_,
@ -396,7 +396,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
),
ca2_
(
dimensionedScalar::lookupOrAddToDict
dimensionedScalar::getOrAddToDict
(
"ca2",
this->coeffDict_,
@ -405,7 +405,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
),
ce1_
(
dimensionedScalar::lookupOrAddToDict
dimensionedScalar::getOrAddToDict
(
"ce1",
this->coeffDict_,
@ -414,7 +414,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
),
ce2_
(
dimensionedScalar::lookupOrAddToDict
dimensionedScalar::getOrAddToDict
(
"ce2",
this->coeffDict_,
@ -423,7 +423,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
),
cThetat_
(
dimensionedScalar::lookupOrAddToDict
dimensionedScalar::getOrAddToDict
(
"cThetat",
this->coeffDict_,
@ -432,7 +432,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
),
sigmaThetat_
(
dimensionedScalar::lookupOrAddToDict
dimensionedScalar::getOrAddToDict
(
"sigmaThetat",
this->coeffDict_,
@ -441,11 +441,11 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
),
lambdaErr_
(
this->coeffDict_.lookupOrDefault("lambdaErr", 1e-6)
this->coeffDict_.template getOrDefault<scalar>("lambdaErr", 1e-6)
),
maxLambdaIter_
(
this->coeffDict_.lookupOrDefault("maxLambdaIter", 10)
this->coeffDict_.template getOrDefault<label>("maxLambdaIter", 10)
),
deltaU_("deltaU", dimVelocity, SMALL),

12
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -122,7 +122,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
Cs_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"Cs",
this->coeffDict_,
@ -131,7 +131,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
),
kappa_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"kappa",
this->coeffDict_,
@ -140,7 +140,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
),
zeta2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"zeta2",
this->coeffDict_,
@ -149,7 +149,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
),
sigmaPhi_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaPhi",
this->coeffDict_,
@ -158,7 +158,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
),
C_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C",
this->coeffDict_,

10
src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -156,7 +156,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
),
A0_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"A0",
this->coeffDict_,
@ -165,7 +165,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
),
C2_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"C2",
this->coeffDict_,
@ -174,7 +174,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
),
sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmak",
this->coeffDict_,
@ -183,7 +183,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
),
sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"sigmaEps",
this->coeffDict_,

3
src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -133,7 +134,7 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::ReynoldsStress
couplingFactor_
(
dimensioned<scalar>::lookupOrAddToDict
dimensioned<scalar>::getOrAddToDict
(
"couplingFactor",
this->coeffDict_,

3
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -53,7 +54,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
)
:
fixedValueFvPatchVectorField(p, iF, dict, false),
tau0_(dict.lookupOrDefault<vector>("tau", Zero))
tau0_(dict.getOrDefault<vector>("tau", Zero))
{
fvPatchField<vector>::operator=(patchInternalField());
}

7
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -56,12 +57,12 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
)
:
fixedJumpFvPatchField<scalar>(p, iF),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
phiName_(dict.getOrDefault<word>("phi", "phi")),
rhoName_(dict.getOrDefault<word>("rho", "rho")),
D_(Function1<scalar>::New("D", dict)),
I_(Function1<scalar>::New("I", dict)),
length_(dict.get<scalar>("length")),
uniformJump_(dict.lookupOrDefault("uniformJump", false))
uniformJump_(dict.getOrDefault("uniformJump", false))
{
fvPatchField<scalar>::operator=
(

4
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -155,7 +155,7 @@ nutUBlendedWallFunctionFvPatchScalarField
)
:
nutWallFunctionFvPatchScalarField(p, iF, dict),
n_(dict.lookupOrDefault<scalar>("n", 4))
n_(dict.getOrDefault<scalar>("n", 4))
{}

6
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -268,8 +268,8 @@ nutURoughWallFunctionFvPatchScalarField
roughnessHeight_(dict.get<scalar>("roughnessHeight")),
roughnessConstant_(dict.get<scalar>("roughnessConstant")),
roughnessFactor_(dict.get<scalar>("roughnessFactor")),
maxIter_(dict.lookupOrDefault<label>("maxIter", 10)),
tolerance_(dict.lookupOrDefault<scalar>("tolerance", 0.0001))
maxIter_(dict.getOrDefault<label>("maxIter", 10)),
tolerance_(dict.getOrDefault<scalar>("tolerance", 0.0001))
{}

6
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -249,8 +249,8 @@ nutUSpaldingWallFunctionFvPatchScalarField
)
:
nutWallFunctionFvPatchScalarField(p, iF, dict),
maxIter_(dict.lookupOrDefault<label>("maxIter", 10)),
tolerance_(dict.lookupOrDefault<scalar>("tolerance", 0.01))
maxIter_(dict.getOrDefault<label>("maxIter", 10)),
tolerance_(dict.getOrDefault<scalar>("tolerance", 0.01))
//invocations_(0),
//nontrivial_(0),
//nonconvergence_(0),

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View File

@ -307,7 +307,7 @@ Foam::omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
)
:
fixedValueFvPatchField<scalar>(p, iF, dict),
blended_(dict.getOrDefault<bool>("blended", true)),
blended_(dict.getOrDefault("blended", true)),
initialised_(false),
master_(-1),
beta1_(dict.getOrDefault<scalar>("beta1", 0.075)),

2
src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
View File

@ -69,7 +69,7 @@ Foam::laminarModel<BasicTurbulenceModel>::laminarModel
),
laminarDict_(this->subOrEmptyDict("laminar")),
printCoeffs_(laminarDict_.lookupOrDefault<Switch>("printCoeffs", false)),
printCoeffs_(laminarDict_.getOrDefault<Switch>("printCoeffs", false)),
coeffDict_(laminarDict_.optionalSubDict(type + "Coeffs"))
{
// Force the construction of the mesh deltaCoeffs which may be needed

6
src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2014-2016 OpenFOAM Foundation
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -61,8 +61,8 @@ atmBoundaryLayer::atmBoundaryLayer
patch_(pp),
flowDir_(TimeFunction1<vector>(time, "flowDir", dict)),
zDir_(TimeFunction1<vector>(time, "zDir", dict)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
Cmu_(dict.getOrDefault<scalar>("Cmu", 0.09)),
Uref_(TimeFunction1<scalar>(time, "Uref", dict)),
Zref_(TimeFunction1<scalar>(time, "Zref", dict)),
z0_(PatchFunction1<scalar>::New(pp, "z0", dict)),

3
src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2018 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -61,7 +62,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
inletOutletFvPatchScalarField(p, iF),
atmBoundaryLayer(iF.time(), p.patch(), dict)
{
phiName_ = dict.lookupOrDefault<word>("phi", "phi");
phiName_ = dict.getOrDefault<word>("phi", "phi");
refValue() = epsilon(patch().Cf());
refGrad() = 0;

Some files were not shown because too many files have changed in this diff Show More