STYLE: consistent lookupOrDefault template parameters

- in many cases can just use lookupOrDefault("key", bool) instead of lookupOrDefault<bool> or lookupOrDefault<Switch> since reading a bool from an Istream uses the Switch(Istream&) anyhow STYLE: relocated Switch string names into file-local scope
2025-11-28 03:28:01 +00:00 · 2018-03-26 09:09:09 +02:00
parent 568fbf727d
commit 36719bf55b
75 changed files with 161 additions and 163 deletions
--- a/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H
@ -2,10 +2,10 @@

 bool correctPhi
 (
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );

 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );
--- a/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H
@ -1,6 +1,6 @@
 #include "readTimeControls.H"

-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);

 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@ -121,14 +121,14 @@ IOdictionary additionalControlsDict
    )
 );

-Switch solvePrimaryRegion
+bool solvePrimaryRegion
 (
-    additionalControlsDict.lookup("solvePrimaryRegion")
+    additionalControlsDict.lookupOrDefault("solvePrimaryRegion", true)
 );

-Switch solvePyrolysisRegion
+bool solvePyrolysisRegion
 (
-    additionalControlsDict.lookupOrDefault<bool>("solvePyrolysisRegion", true)
+    additionalControlsDict.lookupOrDefault("solvePyrolysisRegion", true)
 );

 volScalarField Qdot
--- a/applications/solvers/combustion/fireFoam/phrghEqn.H
+++ b/applications/solvers/combustion/fireFoam/phrghEqn.H
@ -1,4 +1,4 @@
-if (pimple.dict().lookupOrDefault<bool>("hydrostaticInitialization", false))
+if (pimple.dict().lookupOrDefault("hydrostaticInitialization", false))
 {
    volScalarField& ph_rgh = regIOobject::store
    (
--- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H
+++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H
@ -17,7 +17,7 @@

    const dictionary& eosDict = thermoDict.subDict("equationOfState");

-    bool local = eosDict.lookupOrDefault<bool>("local", false);
+    bool local = eosDict.lookupOrDefault("local", false);

    // Evolve T as:
    //
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/createControls.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/createControls.H
@ -2,10 +2,10 @@

 bool correctPhi
 (
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );

 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/readControls.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/readControls.H
@ -1,6 +1,6 @@
 #include "readTimeControls.H"

-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);

 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/createControls.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/createControls.H
@ -2,10 +2,10 @@

 bool correctPhi
 (
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );

 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/readControls.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/readControls.H
@ -1,6 +1,6 @@
 #include "readTimeControls.H"

-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);

 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@ -105,9 +105,9 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-Switch solvePrimaryRegion
+bool solvePrimaryRegion
 (
-    pimple.dict().lookupOrDefault<Switch>("solvePrimaryRegion", true)
+    pimple.dict().lookupOrDefault("solvePrimaryRegion", true)
 );

 volScalarField Qdot
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H
@ -1,11 +1,11 @@
 #include "createTimeControls.H"

+bool correctPhi
+(
+    pimple.dict().lookupOrDefault("correctPhi", true)
+);
+
 scalar maxAcousticCo
 (
    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
 );
-
-bool correctPhi
-(
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
-);
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H
@ -1,4 +1,4 @@
 #include "readTimeControls.H"

+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
 maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H
@ -2,15 +2,15 @@

 bool correctPhi
 (
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );

 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );

 bool moveMeshOuterCorrectors
 (
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
 );
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
@ -1,9 +1,9 @@
 #include "readTimeControls.H"

-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);

 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

 moveMeshOuterCorrectors =
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false);
--- a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
@ -4,12 +4,12 @@ label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));

 label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));

-bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
+bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));

 // Apply the compression correction from the previous iteration
 // Improves efficiency for steady-simulations but can only be applied
 // once the alpha field is reasonably steady, i.e. fully developed
 bool alphaApplyPrevCorr
 (
-    alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
+    alphaControls.lookupOrDefault("alphaApplyPrevCorr", false)
 );
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
@ -1,14 +1,14 @@
 bool correctPhi
 (
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );

 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );

 bool moveMeshOuterCorrectors
 (
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
 );
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H
@ -1,9 +1,9 @@
 #include "readTimeControls.H"

-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);

 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

 moveMeshOuterCorrectors =
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false);
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H
@ -1,16 +1,16 @@
 bool correctPhi
 (
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );

 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );

 bool moveMeshOuterCorrectors
 (
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
 );


--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/readControls.H
@ -1,12 +1,12 @@
 #include "readTimeControls.H"

-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", false);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);

 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

 moveMeshOuterCorrectors =
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false);

 massFluxInterpolation =
    pimple.dict().lookupOrDefault("massFluxInterpolation", false);
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
@ -4,14 +4,14 @@ label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));

 label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));

-bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
+bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));

 // Apply the compression correction from the previous iteration
 // Improves efficiency for steady-simulations but can only be applied
 // once the alpha field is reasonably steady, i.e. fully developed
 //bool alphaApplyPrevCorr
 //(
-//    alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
+//    alphaControls.lookupOrDefault("alphaApplyPrevCorr", false)
 //);

 // Isotropic compression coefficient
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
@ -62,14 +62,14 @@ int main(int argc, char *argv[])
        #include "setInitialDeltaT.H"
    }

-    // Switch faceMomentum
+    // bool faceMomentum
    // (
-    //     pimple.dict().lookupOrDefault<Switch>("faceMomentum", false)
+    //     pimple.dict().lookupOrDefault("faceMomentum", false)
    // );

-    // Switch implicitPhasePressure
+    // bool implicitPhasePressure
    // (
-    //     mesh.solverDict(alpha1.name()).lookupOrDefault<Switch>
+    //     mesh.solverDict(alpha1.name()).lookupOrDefault
    //     (
    //         "implicitPhasePressure", false
    //     )
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
@ -91,14 +91,14 @@ int main(int argc, char *argv[])
        #include "setInitialDeltaT.H"
    }

-    Switch faceMomentum
+    bool faceMomentum
    (
-        pimple.dict().lookupOrDefault<Switch>("faceMomentum", false)
+        pimple.dict().lookupOrDefault("faceMomentum", false)
    );

-    Switch implicitPhasePressure
+    bool implicitPhasePressure
    (
-        mesh.solverDict(alpha1.name()).lookupOrDefault<Switch>
+        mesh.solverDict(alpha1.name()).lookupOrDefault
        (
            "implicitPhasePressure", false
        )
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@ -57,14 +57,14 @@ int main(int argc, char *argv[])
    #include "CourantNos.H"
    #include "setInitialDeltaT.H"

-    Switch faceMomentum
+    bool faceMomentum
    (
-        pimple.dict().lookupOrDefault<Switch>("faceMomentum", false)
+        pimple.dict().lookupOrDefault("faceMomentum", false)
    );

-    Switch implicitPhasePressure
+    bool implicitPhasePressure
    (
-        mesh.solverDict(alpha1.name()).lookupOrDefault<Switch>
+        mesh.solverDict(alpha1.name()).lookupOrDefault
        (
            "implicitPhasePressure", false
        )
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@ -183,7 +183,7 @@ int main(int argc, char *argv[])

    bool moveMeshOuterCorrectors
    (
-        pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+        pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
    );

    while (runTime.loop())
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@ -282,10 +282,10 @@ int main(int argc, char *argv[])
    const word viewFactorWall("viewFactorWall");

    const bool writeViewFactors =
-        viewFactorDict.lookupOrDefault<bool>("writeViewFactorMatrix", false);
+        viewFactorDict.lookupOrDefault("writeViewFactorMatrix", false);

    const bool dumpRays =
-        viewFactorDict.lookupOrDefault<bool>("dumpRays", false);
+        viewFactorDict.lookupOrDefault("dumpRays", false);

    const label debug = viewFactorDict.lookupOrDefault<label>("debug", 0);

--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@ -463,7 +463,7 @@ int main(int argc, char *argv[])
            }

            // Suboption: "nonManifoldEdges" (false: remove non-manifold edges)
-            if (!subsetDict.lookupOrDefault<bool>("nonManifoldEdges", true))
+            if (!subsetDict.lookupOrDefault("nonManifoldEdges", true))
            {
                Info<< "Removing all non-manifold edges"
                    << " (edges with > 2 connected faces) unless they"
@ -478,7 +478,7 @@ int main(int argc, char *argv[])
            }

            // Suboption: "openEdges" (false: remove open edges)
-            if (!subsetDict.lookupOrDefault<bool>("openEdges", true))
+            if (!subsetDict.lookupOrDefault("openEdges", true))
            {
                Info<< "Removing all open edges"
                    << " (edges with 1 connected face)" << endl;
@ -650,7 +650,7 @@ int main(int argc, char *argv[])
        }

        // Option: "closeness"
-        if (surfaceDict.lookupOrDefault<bool>("closeness", false))
+        if (surfaceDict.lookupOrDefault("closeness", false))
        {
            Pair<tmp<scalarField>> tcloseness =
                triSurfaceTools::writeCloseness
@ -697,7 +697,7 @@ int main(int argc, char *argv[])
        }

        // Option: "curvature"
-        if (surfaceDict.lookupOrDefault<bool>("curvature", false))
+        if (surfaceDict.lookupOrDefault("curvature", false))
        {
            tmp<scalarField> tcurvatureField =
                triSurfaceTools::writeCurvature
@ -727,7 +727,7 @@ int main(int argc, char *argv[])
        }

        // Option: "featureProximity"
-        if (surfaceDict.lookupOrDefault<bool>("featureProximity", false))
+        if (surfaceDict.lookupOrDefault("featureProximity", false))
        {
            tmp<scalarField> tproximity =
                edgeMeshTools::writeFeatureProximity
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@ -269,7 +269,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<Switch>("adjustTimeStep", false))
+    if (controlDict_.lookupOrDefault("adjustTimeStep", false))
    {
        if (timeDict.readIfPresent("deltaT", deltaT_))
        {
@ -358,7 +358,7 @@ void Foam::Time::setMonitoring(const bool forceProfiling)
    else if
    (
        profilingDict
-     && profilingDict->lookupOrDefault<bool>("active", true)
+     && profilingDict->lookupOrDefault("active", true)
    )
    {
        profiling::initialize
--- a/src/OpenFOAM/global/profiling/profiling.C
+++ b/src/OpenFOAM/global/profiling/profiling.C
@ -270,17 +270,17 @@ Foam::profiling::profiling
    timers_(),
    sysInfo_
    (
-        dict.lookupOrDefault<bool>("sysInfo", false)
+        dict.lookupOrDefault("sysInfo", false)
      ? new profilingSysInfo() : nullptr
    ),
    cpuInfo_
    (
-        dict.lookupOrDefault<bool>("cpuInfo", false)
+        dict.lookupOrDefault("cpuInfo", false)
      ? new cpuInfo() : nullptr
    ),
    memInfo_
    (
-        dict.lookupOrDefault<bool>("memInfo", false)
+        dict.lookupOrDefault("memInfo", false)
      ? new memInfo() : nullptr
    )
 {}
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C
@ -30,7 +30,17 @@ License

 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

-const char* Foam::Switch::names[9] =
+namespace
+{
+static_assert
+(
+    Foam::Switch::INVALID+1 == 9,
+    "Switch::switchType does not have 9 entries"
+);
+
+//- The names corresponding to the Switch::switchType enumeration.
+//  Includes extra entries for "invalid".
+static const char* names[9] =
 {
    "false", "true",
    "no",    "yes",
@ -39,6 +49,7 @@ const char* Foam::Switch::names[9] =
    "invalid"
 };

+} // End anonymous namespace

 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //

--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.H
@ -92,15 +92,12 @@ private:
        //- The logic and enumerated text representation stored in a byte
        unsigned char switch_;

-        //- The set of names corresponding to the switchType enumeration.
-        //  Includes extra entries for "invalid".
-        static const char* names[9];
-
    // Static Member Functions

        //- Return enum value for input string
        static switchType parse(const std::string& str, bool allowBad);

+
 public:

    // Constructors
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.C
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.C
@ -139,7 +139,7 @@ const Foam::dictionary& Foam::subModelBase::properties() const

 bool Foam::subModelBase::defaultCoeffs(const bool printMsg) const
 {
-    bool def = coeffDict_.lookupOrDefault<bool>("defaultCoeffs", false);
+    bool def = coeffDict_.lookupOrDefault("defaultCoeffs", false);
    if (printMsg && def)
    {
        Info<< incrIndent;
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@ -95,7 +95,7 @@ thermalBaffle1DFvPatchScalarField
    mappedPatchBase(p.patch(), NEARESTPATCHFACE, dict),
    mixedFvPatchScalarField(p, iF),
    TName_("T"),
-    baffleActivated_(dict.lookupOrDefault<bool>("baffleActivated", true)),
+    baffleActivated_(dict.lookupOrDefault("baffleActivated", true)),
    thickness_(),
    qs_(p.size(), 0),
    solidDict_(dict),
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@ -1225,7 +1225,7 @@ Foam::edgeCollapser::edgeCollapser
    ),
    allowEarlyCollapseToPoint_
    (
-        dict.lookupOrDefault<Switch>("allowEarlyCollapseToPoint", true)
+        dict.lookupOrDefault("allowEarlyCollapseToPoint", true)
    ),
    allowEarlyCollapseCoeff_
    (
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@ -93,7 +93,7 @@ private:

        //- Allow a face to be collapsed to a point early, before the test
        //  to collapse to an edge
-        const Switch allowEarlyCollapseToPoint_;
+        const bool allowEarlyCollapseToPoint_;

        //- Fraction of maxCollapseFaceToPointSideLengthCoeff_ to use when
        //  allowEarlyCollapseToPoint_ is on
--- a/src/finiteVolume/cfdTools/general/coupling/externalFileCoupler.C
+++ b/src/finiteVolume/cfdTools/general/coupling/externalFileCoupler.C
@ -153,7 +153,7 @@ bool Foam::externalFileCoupler::readDict(const dictionary& dict)
        dict.lookup("commsDir") >> commsDir_;
        commsDir_.expand();
        commsDir_.clean();
-        slaveFirst_ = dict.lookupOrDefault<bool>("initByExternal", false);
+        slaveFirst_ = dict.lookupOrDefault("initByExternal", false);

        Info<< type() << ": initialize" << nl
            << "    directory: " << commsDir_ << nl
@ -169,7 +169,7 @@ bool Foam::externalFileCoupler::readDict(const dictionary& dict)

    timeOut_ = dict.lookupOrDefault("timeOut", 100*waitInterval_);

-    log = dict.lookupOrDefault<bool>("log", false);
+    log = dict.lookupOrDefault("log", false);

    return true;
 }
--- a/src/finiteVolume/cfdTools/general/include/alphaControls.H
+++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H
@ -4,14 +4,14 @@ label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));

 label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));

-bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
+bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));

 // Apply the compression correction from the previous iteration
 // Improves efficiency for steady-simulations but can only be applied
 // once the alpha field is reasonably steady, i.e. fully developed
 bool alphaApplyPrevCorr
 (
-    alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
+    alphaControls.lookupOrDefault("alphaApplyPrevCorr", false)
 );

 // Isotropic compression coefficient
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@ -67,8 +67,8 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
    uniformJumpFvPatchField<Type>(p, iF, dict),
    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    uniformJump_(dict.lookupOrDefault<bool>("uniformJump", false)),
-    nonDimensional_(dict.lookupOrDefault<Switch>("nonDimensional", false)),
+    uniformJump_(dict.lookupOrDefault("uniformJump", false)),
+    nonDimensional_(dict.lookupOrDefault("nonDimensional", false)),
    rpm_(dict.lookupOrDefault<scalar>("rpm", 0.0)),
    dm_(dict.lookupOrDefault<scalar>("dm", 0.0))
 {
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@ -136,7 +136,7 @@ class fanFvPatchField
        bool uniformJump_;

        //- Swtich for using non-dimensional curve
-        Switch nonDimensional_;
+        bool nonDimensional_;

        // Parameters for non-dimensional table

--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@ -96,8 +96,8 @@ Foam::fanFvPatchField<Foam::scalar>::fanFvPatchField
    uniformJumpFvPatchField<scalar>(p, iF),
    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    uniformJump_(dict.lookupOrDefault<bool>("uniformJump", false)),
-    nonDimensional_(dict.lookupOrDefault<Switch>("nonDimensional", false)),
+    uniformJump_(dict.lookupOrDefault("uniformJump", false)),
+    nonDimensional_(dict.lookupOrDefault("nonDimensional", false)),
    rpm_(dict.lookupOrDefault<scalar>("rpm", 0.0)),
    dm_(dict.lookupOrDefault<scalar>("dm", 0.0))
 {
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@ -66,7 +66,7 @@ flowRateOutletVelocityFvPatchVectorField
    {
        volumetric_ = false;
        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
-        rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
+        rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
    }
    else
    {
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
@ -62,7 +62,7 @@ matchedFlowRateOutletVelocityFvPatchVectorField
    }
    else
    {
-        rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
+        rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
    }

    // Value field require if mass based
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
@ -153,7 +153,7 @@ Foam::swirlFanVelocityFvPatchField::swirlFanVelocityFvPatchField
    rpm_(dict.lookupOrDefault<scalar>("rpm", 0.0)),
    rEff_(dict.lookupOrDefault<scalar>("rEff", 0.0)),
    fanEff_(dict.lookupOrDefault<scalar>("fanEff", 1.0)),
-    useRealRadius_(dict.lookupOrDefault<Switch>("useRealRadius", false)),
+    useRealRadius_(dict.lookupOrDefault("useRealRadius", false)),
    rInner_(dict.lookupOrDefault<scalar>("rInner", 0.0)),
    rOuter_(dict.lookupOrDefault<scalar>("rOuter", 0.0))
 {}
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.H
@ -140,7 +140,7 @@ class swirlFanVelocityFvPatchField
        scalar fanEff_;

        //- Switch to use effective radius or inner and outer radius
-        Switch useRealRadius_;
+        bool useRealRadius_;

        //- Inner radius
        scalar rInner_;
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@ -856,7 +856,7 @@ turbulentDFSEMInletFvPatchVectorField
    curTimeIndex_(-1),
    patchBounds_(boundBox::invertedBox),
    singleProc_(false),
-    writeEddies_(dict.lookupOrDefault<bool>("writeEddies", false))
+    writeEddies_(dict.lookupOrDefault("writeEddies", false))
 {
    eddy::debug = debug;

--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
@ -82,14 +82,8 @@ Foam::isoAdvection::isoAdvection
    nAlphaBounds_(dict_.lookupOrDefault<label>("nAlphaBounds", 3)),
    isoFaceTol_(dict_.lookupOrDefault<scalar>("isoFaceTol", 1e-8)),
    surfCellTol_(dict_.lookupOrDefault<scalar>("surfCellTol", 1e-8)),
-    gradAlphaBasedNormal_
-    (
-        dict_.lookupOrDefault<bool>("gradAlphaNormal", false)
-    ),
-    writeIsoFacesToFile_
-    (
-        dict_.lookupOrDefault<bool>("writeIsoFaces", false)
-    ),
+    gradAlphaBasedNormal_(dict_.lookupOrDefault("gradAlphaNormal", false)),
+    writeIsoFacesToFile_(dict_.lookupOrDefault("writeIsoFaces", false)),

    // Cell cutting data
    surfCells_(label(0.2*mesh_.nCells())),
@ -1021,8 +1015,7 @@ void Foam::isoAdvection::applyBruteForceBounding()
        alpha1Changed = true;
    }

-    bool clip = dict_.lookupOrDefault<bool>("clip", true);
-    if (clip)
+    if (dict_.lookupOrDefault("clip", true))
    {
        alpha1_ = min(scalar(1.0), max(scalar(0.0), alpha1_));
        alpha1Changed = true;
@ -1037,7 +1030,7 @@ void Foam::isoAdvection::applyBruteForceBounding()

 void Foam::isoAdvection::writeSurfaceCells() const
 {
-    if (dict_.lookupOrDefault<bool>("writeSurfCells", false))
+    if (dict_.lookupOrDefault("writeSurfCells", false))
    {
        cellSet cSet
        (
@ -1059,7 +1052,7 @@ void Foam::isoAdvection::writeSurfaceCells() const

 void Foam::isoAdvection::writeBoundedCells() const
 {
-    if (dict_.lookupOrDefault<bool>("writeBoundedCells", false))
+    if (dict_.lookupOrDefault("writeBoundedCells", false))
    {
        cellSet cSet
        (
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
@ -53,7 +53,7 @@ Foam::patchDistMethods::meshWave::meshWave
 )
 :
    patchDistMethod(mesh, patchIDs),
-    correctWalls_(dict.lookupOrDefault<Switch>("correctWalls", true)),
+    correctWalls_(dict.lookupOrDefault("correctWalls", true)),
    nUnset_(0)
 {}

--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@ -106,7 +106,7 @@ Foam::wallDist::wallDist
        dimensionedScalar("y" & patchTypeName_, dimLength, SMALL),
        patchDistMethod::patchTypes<scalar>(mesh, patchIDs_)
    ),
-    nRequired_(dict_.lookupOrDefault<Switch>("nRequired", false)),
+    nRequired_(dict_.lookupOrDefault("nRequired", false)),
    n_(volVectorField::null()),
    updateInterval_(dict_.lookupOrDefault<label>("updateInterval", 1)),
    requireUpdate_(true)
@ -160,7 +160,7 @@ Foam::wallDist::wallDist
        dimensionedScalar("y" & patchTypeName_, dimLength, SMALL),
        patchDistMethod::patchTypes<scalar>(mesh, patchIDs_)
    ),
-    nRequired_(dict_.lookupOrDefault<Switch>("nRequired", false)),
+    nRequired_(dict_.lookupOrDefault("nRequired", false)),
    n_(volVectorField::null()),
    updateInterval_(dict_.lookupOrDefault<label>("updateInterval", 1)),
    requireUpdate_(true)
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
@ -136,7 +136,7 @@ bool Foam::functionObjects::fieldMinMax::read(const dictionary& dict)
    fvMeshFunctionObject::read(dict);
    writeFile::read(dict);

-    location_ = dict.lookupOrDefault<Switch>("location", true);
+    location_ = dict.lookupOrDefault("location", true);

    mode_ = modeTypeNames_.lookupOrDefault("mode", dict, modeType::mdMag);

--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
@ -118,8 +118,8 @@ protected:
        //- Mode type names
        static const Enum<modeType> modeTypeNames_;

-        //- Switch to write location of min/max values
-        Switch location_;
+        //- Write location of min/max values?
+        bool location_;

        //- Mode for min/max - only applicable for ranks > 0
        modeType mode_;
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@ -319,7 +319,7 @@ Foam::functionObjects::regionSizeDistribution::regionSizeDistribution
    writeFile(obr_, name),
    alphaName_(dict.lookup("field")),
    patchNames_(dict.lookup("patches")),
-    isoPlanes_(dict.lookupOrDefault<bool>("isoPlanes", false))
+    isoPlanes_(dict.lookupOrDefault("isoPlanes", false))
 {
    read(dict);
 }
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.C
@ -89,7 +89,7 @@ Foam::functionObjects::runTimePostPro::functionObjectBase::functionObjectBase
    fieldVisualisationBase(dict, colours),
    state_(state),
    functionObjectName_(""),
-    clearObjects_(dict.lookupOrDefault<bool>("clearObjects", false))
+    clearObjects_(dict.lookupOrDefault("clearObjects", false))
 {
    dict.lookup("functionObject") >> functionObjectName_;
 }
--- a/src/functionObjects/graphics/runTimePostProcessing/text.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/text.C
@ -49,7 +49,7 @@ Foam::functionObjects::runTimePostPro::text::text
    size_(readScalar(dict.lookup("size"))),
    colour_(nullptr),
    bold_(readBool(dict.lookup("bold"))),
-    timeStamp_(dict.lookupOrDefault<bool>("timeStamp", false))
+    timeStamp_(dict.lookupOrDefault("timeStamp", false))
 {
    if (dict.found("colour"))
    {
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@ -209,7 +209,7 @@ Foam::functionObjects::scalarTransport::scalarTransport
    resetOnStartUp_(false),
    schemesField_("unknown-schemesField"),
    fvOptions_(mesh_),
-    bounded01_(dict.lookupOrDefault<Switch>("bounded01", true))
+    bounded01_(dict.lookupOrDefault("bounded01", true))
 {
    read(dict);

--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C
@ -82,7 +82,7 @@ Foam::functionObjects::runTimeControls::runTimeCondition::runTimeCondition
    name_(name),
    obr_(obr),
    state_(state),
-    active_(dict.lookupOrDefault<bool>("active", true)),
+    active_(dict.lookupOrDefault("active", true)),
    conditionDict_(setConditionDict()),
    log_(dict.lookupOrDefault("log", true)),
    groupID_(dict.lookupOrDefault("groupID", -1))
--- a/src/functionObjects/utilities/vtkWrite/vtkWrite.C
+++ b/src/functionObjects/utilities/vtkWrite/vtkWrite.C
@ -70,7 +70,7 @@ bool Foam::functionObjects::vtkWrite::read(const dictionary& dict)
    // writer options - default is xml base64
    //
    writeOpts_ = vtk::formatType::INLINE_BASE64;
-    if (dict.lookupOrDefault<bool>("legacy", false))
+    if (dict.lookupOrDefault("legacy", false))
    {
        writeOpts_.legacy(true);
    }
@ -99,7 +99,7 @@ bool Foam::functionObjects::vtkWrite::read(const dictionary& dict)
    //
    dict.readIfPresent("directory", dirName_);

-    writeIds_ = dict.lookupOrDefault<bool>("writeIds", false);
+    writeIds_ = dict.lookupOrDefault("writeIds", false);


    //
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@ -102,7 +102,7 @@ Foam::fv::interRegionOption::interRegionOption
        dict,
        mesh
    ),
-    master_(coeffs_.lookupOrDefault<bool>("master", true)),
+    master_(coeffs_.lookupOrDefault("master", true)),
    nbrRegionName_(coeffs_.lookup("nbrRegion")),
    meshInterpPtr_()
 {
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@ -224,7 +224,7 @@ void Foam::targetCoeffTrim::read(const dictionary& dict)
    trimModel::read(dict);

    const dictionary& targetDict(coeffs_.subDict("target"));
-    useCoeffs_ = targetDict.lookupOrDefault<bool>("useCoeffs", true);
+    useCoeffs_ = targetDict.lookupOrDefault("useCoeffs", true);
    word ext = "";
    if (useCoeffs_)
    {
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C
@ -140,7 +140,7 @@ Foam::CloudToVTK<CloudType>::CloudToVTK
 )
 :
    CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
-    binary_(dict.lookupOrDefault<bool>("binary", true))
+    binary_(dict.lookupOrDefault("binary", true))
 {}


--- a/src/mesh/blockMesh/blockMesh/blockMesh.C
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.C
@ -39,7 +39,7 @@ namespace Foam
 Foam::blockMesh::blockMesh(const IOdictionary& dict, const word& regionName)
 :
    meshDict_(dict),
-    verboseOutput(meshDict_.lookupOrDefault<Switch>("verbose", true)),
+    verboseOutput(meshDict_.lookupOrDefault("verbose", true)),
    geometry_
    (
        IOobject
@ -65,9 +65,7 @@ Foam::blockMesh::blockMesh(const IOdictionary& dict, const word& regionName)
    vertices_(Foam::vertices(blockVertices_)),
    topologyPtr_(createTopology(meshDict_, regionName))
 {
-    Switch fastMerge(meshDict_.lookupOrDefault<Switch>("fastMerge", false));
-
-    if (fastMerge)
+    if (meshDict_.lookupOrDefault("fastMerge", false))
    {
        calcMergeInfoFast();
    }
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
@ -58,7 +58,7 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
    allowFreeStandingZoneFaces_(dict.lookup("allowFreeStandingZoneFaces")),
    useTopologicalSnapDetection_
    (
-        dict.lookupOrDefault<bool>("useTopologicalSnapDetection", true)
+        dict.lookupOrDefault("useTopologicalSnapDetection", true)
    ),
    maxLoadUnbalance_(dict.lookupOrDefault<scalar>("maxLoadUnbalance", 0)),
    handleSnapProblems_
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@ -538,7 +538,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
            )
        )
    ),
-    AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
+    AMIReverse_(dict.lookupOrDefault("flipNormals", false)),
    AMIRequireMatch_(true),
    AMILowWeightCorrection_(dict.lookupOrDefault("lowWeightCorrection", -1.0)),
    surfPtr_(nullptr),
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@ -1037,7 +1037,7 @@ Foam::mappedPatchBase::mappedPatchBase
    sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
    mapPtr_(nullptr),
    AMIPtr_(nullptr),
-    AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
+    AMIReverse_(dict.lookupOrDefault("flipNormals", false)),
    surfPtr_(nullptr),
    surfDict_(dict.subOrEmptyDict("surface"))
 {
@ -1119,7 +1119,7 @@ Foam::mappedPatchBase::mappedPatchBase
    sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
    mapPtr_(nullptr),
    AMIPtr_(nullptr),
-    AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
+    AMIReverse_(dict.lookupOrDefault("flipNormals", false)),
    surfPtr_(nullptr),
    surfDict_(dict.subOrEmptyDict("surface"))
 {
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@ -151,7 +151,7 @@ Foam::regionCoupledBase::regionCoupledBase
    nbrRegionName_(dict.lookup("neighbourRegion")),
    sameRegion_(nbrRegionName_ == patch_.boundaryMesh().mesh().name()),
    AMIPtr_(nullptr),
-    AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
+    AMIReverse_(dict.lookupOrDefault("flipNormals", false)),
    surfPtr_(nullptr),
    surfDict_(dict.subOrEmptyDict("surface"))
 {}
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
@ -431,7 +431,7 @@ Foam::surfaceToCell::surfaceToCell
    includeOutside_(readBool(dict.lookup("includeOutside"))),
    useSurfaceOrientation_
    (
-        dict.lookupOrDefault<bool>("useSurfaceOrientation", false)
+        dict.lookupOrDefault("useSurfaceOrientation", false)
    ),
    nearDist_(readScalar(dict.lookup("nearDistance"))),
    curvature_(readScalar(dict.lookup("curvature"))),
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@ -55,10 +55,10 @@ void reactingOneDim::readReactingOneDimControls()
    solution.lookup("nNonOrthCorr") >> nNonOrthCorr_;
    time().controlDict().lookup("maxDi") >> maxDiff_;
    coeffs().lookup("minimumDelta") >> minimumDelta_;
-    gasHSource_ = coeffs().lookupOrDefault<bool>("gasHSource", false);
+    gasHSource_ = coeffs().lookupOrDefault("gasHSource", false);
    coeffs().lookup("qrHSource") >> qrHSource_;
    useChemistrySolvers_ =
-        coeffs().lookupOrDefault<bool>("useChemistrySolvers", true);
+        coeffs().lookupOrDefault("useChemistrySolvers", true);
 }


--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.C
@ -50,9 +50,9 @@ BrunDrippingInjection::BrunDrippingInjection
 )
 :
    injectionModel(type(), film, dict),
-    ubarStar_(coeffDict_.lookupOrDefault("ubarStar", 1.62208)),
-    dCoeff_(coeffDict_.lookupOrDefault("dCoeff", 3.3)),
-    deltaStable_(coeffDict_.lookupOrDefault("deltaStable", scalar(0))),
+    ubarStar_(coeffDict_.lookupOrDefault<scalar>("ubarStar", 1.62208)),
+    dCoeff_(coeffDict_.lookupOrDefault<scalar>("dCoeff", 3.3)),
+    deltaStable_(coeffDict_.lookupOrDefault<scalar>("deltaStable", 0)),
    diameter_(film.regionMesh().nCells(), -1.0)
 {}

--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
@ -201,7 +201,7 @@ thermalBaffleModel::thermalBaffleModel
    thickness_(),
    delta_("delta", dimLength, 0.0),
    oneD_(false),
-    constantThickness_(dict.lookupOrDefault<bool>("constantThickness", true))
+    constantThickness_(dict.lookupOrDefault("constantThickness", true))
 {
    init();
 }
@ -217,7 +217,7 @@ thermalBaffleModel::thermalBaffleModel
    thickness_(),
    delta_("delta", dimLength, 0.0),
    oneD_(false),
-    constantThickness_(lookupOrDefault<bool>("constantThickness", true))
+    constantThickness_(lookupOrDefault("constantThickness", true))
 {
    init();
 }
--- a/src/renumber/SloanRenumber/SloanRenumber.C
+++ b/src/renumber/SloanRenumber/SloanRenumber.C
@ -95,7 +95,7 @@ Foam::SloanRenumber::SloanRenumber(const dictionary& renumberDict)
        renumberDict.optionalSubDict
        (
            typeName + "Coeffs"
-        ).lookupOrDefault<Switch>("reverse", false)
+        ).lookupOrDefault("reverse", false)
    )
 {}

--- a/src/renumber/SloanRenumber/SloanRenumber.H
+++ b/src/renumber/SloanRenumber/SloanRenumber.H
@ -53,7 +53,7 @@ class SloanRenumber
 {
    // Private data

-        const Switch reverse_;
+        const bool reverse_;


    // Private Member Functions
@ -76,8 +76,7 @@ public:


    //- Destructor
-    virtual ~SloanRenumber()
-    {}
+    virtual ~SloanRenumber() = default;


    // Member Functions
--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
@ -53,7 +53,7 @@ Foam::CuthillMcKeeRenumber::CuthillMcKeeRenumber(const dictionary& renumberDict)
        renumberDict.optionalSubDict
        (
            typeName + "Coeffs"
-        ).lookupOrDefault<Switch>("reverse", false)
+        ).lookupOrDefault("reverse", false)
    )
 {}

--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
@ -51,7 +51,7 @@ class CuthillMcKeeRenumber
 {
    // Private data

-        const Switch reverse_;
+        const bool reverse_;


    // Private Member Functions
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@ -688,7 +688,7 @@ Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh
    ),
    sampleSource_(samplingSourceNames_.lookup("source", dict)),
    needsUpdate_(true),
-    keepIds_(dict.lookupOrDefault<Switch>("keepIds", false)),
+    keepIds_(dict.lookupOrDefault("keepIds", false)),
    originalIds_(),
    zoneIds_(),
    sampleElements_(0),
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
@ -671,7 +671,7 @@ Foam::discreteSurface::discreteSurface
    interpolate_
    (
        allowInterpolate
-     && dict.lookupOrDefault<Switch>("interpolate", false)
+     && dict.lookupOrDefault("interpolate", false)
    ),
    surface_
    (
@ -688,7 +688,7 @@ Foam::discreteSurface::discreteSurface
    ),
    sampleSource_(samplingSourceNames_.lookup("source", dict)),
    needsUpdate_(true),
-    keepIds_(dict.lookupOrDefault<Switch>("keepIds", false)),
+    keepIds_(dict.lookupOrDefault("keepIds", false)),
    originalIds_(),
    zoneIds_(),
    sampleElements_(0),
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@ -79,7 +79,7 @@ greyDiffusiveRadiationMixedFvPatchScalarField
 :
    mixedFvPatchScalarField(p, iF),
    TName_(dict.lookupOrDefault<word>("T", "T")),
-    solarLoad_(dict.lookupOrDefault<bool>("solarLoad", false))
+    solarLoad_(dict.lookupOrDefault("solarLoad", false))
 {
    if (dict.found("refValue"))
    {
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@ -69,7 +69,7 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
 :
    fixedValueFvPatchScalarField(p, iF, dict, false),
    qro_("qro", dict, p.size()),
-    solarLoad_(dict.lookupOrDefault<bool>("solarLoad", false))
+    solarLoad_(dict.lookupOrDefault("solarLoad", false))
 {
    if (dict.found("value"))
    {