mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
STYLE: can use bool instead of Switch version of dictionary::lookupOrDefault
- both versions handle the same input words. Only need the <Switch> version when the destination variable is also a Switch and we need to output the word later.
This commit is contained in:
@ -4,8 +4,8 @@
|
|||||||
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
||||||
|
|
||||||
const bool momentumPredictor =
|
const bool momentumPredictor =
|
||||||
simple.lookupOrDefault<bool>("momentumPredictor", true);
|
simple.lookupOrDefault("momentumPredictor", true);
|
||||||
|
|
||||||
const bool transonic =
|
const bool transonic =
|
||||||
simple.lookupOrDefault<bool>("transonic", false);
|
simple.lookupOrDefault("transonic", false);
|
||||||
|
|
||||||
|
|||||||
@ -7,5 +7,5 @@
|
|||||||
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
||||||
|
|
||||||
const bool momentumPredictor =
|
const bool momentumPredictor =
|
||||||
pimple.lookupOrDefault<bool>("momentumPredictor", true);
|
pimple.lookupOrDefault("momentumPredictor", true);
|
||||||
|
|
||||||
|
|||||||
@ -10,8 +10,8 @@
|
|||||||
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
||||||
|
|
||||||
const bool momentumPredictor =
|
const bool momentumPredictor =
|
||||||
piso.lookupOrDefault<bool>("momentumPredictor", true);
|
piso.lookupOrDefault("momentumPredictor", true);
|
||||||
|
|
||||||
const bool transonic =
|
const bool transonic =
|
||||||
piso.lookupOrDefault<bool>("transonic", false);
|
piso.lookupOrDefault("transonic", false);
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
#include "readPIMPLEControls.H"
|
#include "readPIMPLEControls.H"
|
||||||
|
|
||||||
const bool correctPhi =
|
const bool correctPhi =
|
||||||
pimple.lookupOrDefault<bool>("correctPhi", false);
|
pimple.lookupOrDefault("correctPhi", false);
|
||||||
|
|
||||||
const bool checkMeshCourantNo =
|
const bool checkMeshCourantNo =
|
||||||
pimple.lookupOrDefault<bool>("checkMeshCourantNo", false);
|
pimple.lookupOrDefault("checkMeshCourantNo", false);
|
||||||
|
|
||||||
|
|||||||
@ -96,7 +96,7 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (RASProperties.lookupOrDefault<Switch>("printCoeffs", false))
|
if (RASProperties.lookupOrDefault("printCoeffs", false))
|
||||||
{
|
{
|
||||||
Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
|
Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
|
||||||
<< "wallFunctionCoeffs" << wallFunctionDict << endl;
|
<< "wallFunctionCoeffs" << wallFunctionDict << endl;
|
||||||
|
|||||||
@ -20,8 +20,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
const bool correctPhi =
|
const bool correctPhi =
|
||||||
piso.lookupOrDefault<bool>("correctPhi", true);
|
piso.lookupOrDefault("correctPhi", true);
|
||||||
|
|
||||||
const bool checkMeshCourantNo =
|
const bool checkMeshCourantNo =
|
||||||
piso.lookupOrDefault<bool>("checkMeshCourantNo", false);
|
piso.lookupOrDefault("checkMeshCourantNo", false);
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
# include "readPISOControls.H"
|
# include "readPISOControls.H"
|
||||||
|
|
||||||
const bool correctPhi =
|
const bool correctPhi =
|
||||||
piso.lookupOrDefault<bool>("correctPhi", true);
|
piso.lookupOrDefault("correctPhi", true);
|
||||||
|
|
||||||
const bool checkMeshCourantNo =
|
const bool checkMeshCourantNo =
|
||||||
piso.lookupOrDefault<bool>("checkMeshCourantNo", false);
|
piso.lookupOrDefault("checkMeshCourantNo", false);
|
||||||
|
|
||||||
|
|||||||
@ -276,7 +276,7 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (RASProperties.lookupOrDefault<Switch>("printCoeffs", false))
|
if (RASProperties.lookupOrDefault("printCoeffs", false))
|
||||||
{
|
{
|
||||||
Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
|
Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
|
||||||
<< "wallFunctionCoeffs" << wallFunctionDict << endl;
|
<< "wallFunctionCoeffs" << wallFunctionDict << endl;
|
||||||
|
|||||||
@ -102,7 +102,7 @@ int main(int argc, char *argv[])
|
|||||||
);
|
);
|
||||||
|
|
||||||
const bool invertSelection =
|
const bool invertSelection =
|
||||||
meshSubsetDict.lookupOrDefault<bool>("invertSelection", false);
|
meshSubsetDict.lookupOrDefault("invertSelection", false);
|
||||||
|
|
||||||
// Mark the cells for the subset
|
// Mark the cells for the subset
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,6 @@ License
|
|||||||
#include "clock.H"
|
#include "clock.H"
|
||||||
#include "IFstream.H"
|
#include "IFstream.H"
|
||||||
#include "dictionary.H"
|
#include "dictionary.H"
|
||||||
#include "Switch.H"
|
|
||||||
#include "IOobject.H"
|
#include "IOobject.H"
|
||||||
#include "JobInfo.H"
|
#include "JobInfo.H"
|
||||||
#include "labelList.H"
|
#include "labelList.H"
|
||||||
@ -564,7 +563,7 @@ Foam::argList::argList
|
|||||||
}
|
}
|
||||||
|
|
||||||
// distributed data
|
// distributed data
|
||||||
if (decompDict.lookupOrDefault<Switch>("distributed", false))
|
if (decompDict.lookupOrDefault("distributed", false))
|
||||||
{
|
{
|
||||||
fileNameList roots;
|
fileNameList roots;
|
||||||
decompDict.lookup("roots") >> roots;
|
decompDict.lookup("roots") >> roots;
|
||||||
|
|||||||
@ -58,7 +58,6 @@ SourceFiles
|
|||||||
#include "labelField.H"
|
#include "labelField.H"
|
||||||
#include "primitiveFields.H"
|
#include "primitiveFields.H"
|
||||||
#include "LUscalarMatrix.H"
|
#include "LUscalarMatrix.H"
|
||||||
#include "Switch.H"
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
@ -75,7 +74,7 @@ class GAMGSolver
|
|||||||
{
|
{
|
||||||
// Private data
|
// Private data
|
||||||
|
|
||||||
Switch cacheAgglomeration_;
|
bool cacheAgglomeration_;
|
||||||
|
|
||||||
//- Number of pre-smoothing sweeps
|
//- Number of pre-smoothing sweeps
|
||||||
label nPreSweeps_;
|
label nPreSweeps_;
|
||||||
|
|||||||
@ -255,7 +255,7 @@ bool Foam::solution::read()
|
|||||||
if (dict.found("cache"))
|
if (dict.found("cache"))
|
||||||
{
|
{
|
||||||
cache_ = dict.subDict("cache");
|
cache_ = dict.subDict("cache");
|
||||||
caching_ = cache_.lookupOrDefault<Switch>("active", true);
|
caching_ = cache_.lookupOrDefault("active", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dict.found("relaxationFactors"))
|
if (dict.found("relaxationFactors"))
|
||||||
|
|||||||
@ -36,7 +36,6 @@ SourceFiles
|
|||||||
#define solution_H
|
#define solution_H
|
||||||
|
|
||||||
#include "IOdictionary.H"
|
#include "IOdictionary.H"
|
||||||
#include "Switch.H"
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
@ -57,7 +56,7 @@ class solution
|
|||||||
dictionary cache_;
|
dictionary cache_;
|
||||||
|
|
||||||
//- Switch for the caching mechanism
|
//- Switch for the caching mechanism
|
||||||
Switch caching_;
|
bool caching_;
|
||||||
|
|
||||||
//- Dictionary of relaxation factors for all the fields
|
//- Dictionary of relaxation factors for all the fields
|
||||||
dictionary relaxationFactors_;
|
dictionary relaxationFactors_;
|
||||||
|
|||||||
@ -10,8 +10,8 @@
|
|||||||
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
||||||
|
|
||||||
const bool momentumPredictor =
|
const bool momentumPredictor =
|
||||||
pimple.lookupOrDefault<bool>("momentumPredictor", true);
|
pimple.lookupOrDefault("momentumPredictor", true);
|
||||||
|
|
||||||
const bool transonic =
|
const bool transonic =
|
||||||
pimple.lookupOrDefault<bool>("transonic", false);
|
pimple.lookupOrDefault("transonic", false);
|
||||||
|
|
||||||
|
|||||||
@ -10,8 +10,8 @@
|
|||||||
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
||||||
|
|
||||||
const bool momentumPredictor =
|
const bool momentumPredictor =
|
||||||
piso.lookupOrDefault<bool>("momentumPredictor", true);
|
piso.lookupOrDefault("momentumPredictor", true);
|
||||||
|
|
||||||
const bool transonic =
|
const bool transonic =
|
||||||
piso.lookupOrDefault<bool>("transonic", false);
|
piso.lookupOrDefault("transonic", false);
|
||||||
|
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
|
||||||
|
|
||||||
const bool momentumPredictor =
|
const bool momentumPredictor =
|
||||||
simple.lookupOrDefault<bool>("momentumPredictor", true);
|
simple.lookupOrDefault("momentumPredictor", true);
|
||||||
|
|
||||||
const bool transonic =
|
const bool transonic =
|
||||||
simple.lookupOrDefault<bool>("transonic", false);
|
simple.lookupOrDefault("transonic", false);
|
||||||
|
|
||||||
|
|||||||
@ -30,7 +30,7 @@ Description
|
|||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
const bool adjustTimeStep =
|
const bool adjustTimeStep =
|
||||||
runTime.controlDict().lookupOrDefault<bool>("adjustTimeStep", false);
|
runTime.controlDict().lookupOrDefault("adjustTimeStep", false);
|
||||||
|
|
||||||
scalar maxCo =
|
scalar maxCo =
|
||||||
runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
|
runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
|
||||||
|
|||||||
@ -25,7 +25,6 @@ License
|
|||||||
|
|
||||||
#include "EulerCoordinateRotation.H"
|
#include "EulerCoordinateRotation.H"
|
||||||
|
|
||||||
#include "Switch.H"
|
|
||||||
#include "mathematicalConstants.H"
|
#include "mathematicalConstants.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
|
||||||
@ -137,7 +136,7 @@ Foam::EulerCoordinateRotation::EulerCoordinateRotation
|
|||||||
rotation.component(vector::X),
|
rotation.component(vector::X),
|
||||||
rotation.component(vector::Y),
|
rotation.component(vector::Y),
|
||||||
rotation.component(vector::Z),
|
rotation.component(vector::Z),
|
||||||
dict.lookupOrDefault<Switch>("degrees", true)
|
dict.lookupOrDefault("degrees", true)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,6 @@ License
|
|||||||
|
|
||||||
#include "STARCDCoordinateRotation.H"
|
#include "STARCDCoordinateRotation.H"
|
||||||
|
|
||||||
#include "Switch.H"
|
|
||||||
#include "mathematicalConstants.H"
|
#include "mathematicalConstants.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
|
||||||
@ -138,7 +137,7 @@ Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
|
|||||||
rotation.component(vector::X),
|
rotation.component(vector::X),
|
||||||
rotation.component(vector::Y),
|
rotation.component(vector::Y),
|
||||||
rotation.component(vector::Z),
|
rotation.component(vector::Z),
|
||||||
dict.lookupOrDefault<Switch>("degrees", true)
|
dict.lookupOrDefault("degrees", true)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,6 @@ License
|
|||||||
#include "cylindricalCS.H"
|
#include "cylindricalCS.H"
|
||||||
|
|
||||||
#include "one.H"
|
#include "one.H"
|
||||||
#include "Switch.H"
|
|
||||||
#include "mathematicalConstants.H"
|
#include "mathematicalConstants.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
|
||||||
@ -106,7 +105,7 @@ Foam::cylindricalCS::cylindricalCS
|
|||||||
)
|
)
|
||||||
:
|
:
|
||||||
coordinateSystem(name, dict),
|
coordinateSystem(name, dict),
|
||||||
inDegrees_(dict.lookupOrDefault<Switch>("degrees", true))
|
inDegrees_(dict.lookupOrDefault("degrees", true))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,6 @@ License
|
|||||||
#include "sphericalCS.H"
|
#include "sphericalCS.H"
|
||||||
|
|
||||||
#include "one.H"
|
#include "one.H"
|
||||||
#include "Switch.H"
|
|
||||||
#include "mathematicalConstants.H"
|
#include "mathematicalConstants.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
|
||||||
@ -106,7 +105,7 @@ Foam::sphericalCS::sphericalCS
|
|||||||
)
|
)
|
||||||
:
|
:
|
||||||
coordinateSystem(name, dict),
|
coordinateSystem(name, dict),
|
||||||
inDegrees_(dict.lookupOrDefault<Switch>("degrees", true))
|
inDegrees_(dict.lookupOrDefault("degrees", true))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user