ENH: unify use of dictionary method names

- 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).

applications/solvers/basic/potentialFoam/createControls.H

@@ -5,5 +5,5 @@ const dictionary& potentialFlow
 
 const int nNonOrthCorr
 (
-    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
+    potentialFlow.getOrDefault<int>("nNonOrthogonalCorrectors", 0)
 );

applications/solvers/basic/potentialFoam/overPotentialFoam/createControls.H

@@ -5,5 +5,5 @@ const dictionary& potentialFlow
 
 const int nNonOrthCorr
 (
-    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
+    potentialFlow.getOrDefault<int>("nNonOrthogonalCorrectors", 0)
 );

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -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.
@@ -72,7 +72,7 @@ PDRkEpsilon::PDRkEpsilon
 
     C4_
     (
-        dimensioned<scalar>::lookupOrAddToDict
+        dimensioned<scalar>::getOrAddToDict
         (
             "C4",
             coeffDict_,

applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H

@@ -2,10 +2,10 @@
 
 bool correctPhi
 (
-    pimple.dict().lookupOrDefault("correctPhi", true)
+    pimple.dict().getOrDefault("correctPhi", true)
 );
 
 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+    pimple.dict().getOrDefault("checkMeshCourantNo", false)
 );

applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H

@@ -1,6 +1,6 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
+correctPhi = pimple.dict().getOrDefault("correctPhi", true);
 
 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);

applications/solvers/combustion/fireFoam/createRegionControls.H

@@ -12,12 +12,12 @@ IOdictionary additionalControlsDict
 
 bool solvePrimaryRegion
 (
-    additionalControlsDict.lookupOrDefault("solvePrimaryRegion", true)
+    additionalControlsDict.getOrDefault("solvePrimaryRegion", true)
 );
 
 bool solvePyrolysisRegion
 (
-    additionalControlsDict.lookupOrDefault("solvePyrolysisRegion", true)
+    additionalControlsDict.getOrDefault("solvePyrolysisRegion", true)
 );
 
 scalar maxDi = pyrolysis.maxDiff();

applications/solvers/combustion/fireFoam/phrghEqn.H

@@ -1,4 +1,4 @@
-if (pimple.dict().lookupOrDefault("hydrostaticInitialization", false))
+if (pimple.dict().getOrDefault("hydrostaticInitialization", false))
 {
     volScalarField& ph_rgh = regIOobject::store
     (
@@ -24,7 +24,7 @@ if (pimple.dict().lookupOrDefault("hydrostaticInitialization", false))
 
         label nCorr
         (
-            pimple.dict().lookupOrDefault<label>("nHydrostaticCorrectors", 5)
+            pimple.dict().getOrDefault<label>("nHydrostaticCorrectors", 5)
         );
 
         for (label i=0; i<nCorr; i++)

applications/solvers/combustion/reactingFoam/setRDeltaT.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,27 +35,27 @@ License
     scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
-    scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
+    scalar maxDeltaT(pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT));
 
     // Smoothing parameter (0-1) when smoothing iterations > 0
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     // Damping coefficient (1-0)
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     // Maximum change in cell temperature per iteration
     // (relative to previous value)
-    scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05));
+    scalar alphaTemp(pimpleDict.getOrDefault<scalar>("alphaTemp", 0.05));
 
     // Maximum change in cell concentration per iteration
     // (relative to reference value)
-    scalar alphaY(pimpleDict.lookupOrDefault("alphaY", 1.0));
+    scalar alphaY(pimpleDict.getOrDefault<scalar>("alphaY", 1.0));
 
     Info<< "Time scales min/max:" << endl;
 

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,13 +83,13 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(p, iF),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
+    UName_(dict.getOrDefault<word>("U", "U")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    rhoName_(dict.getOrDefault<word>("rho", "rho")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.getOrDefault<word>("psi", "thermo:psi")),
-    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
+    muName_(dict.getOrDefault<word>("mu", "thermo:mu")),
     accommodationCoeff_(dict.get<scalar>("accommodationCoeff")),
     Twall_("Twall", dict, p.size()),
-    gamma_(dict.lookupOrDefault<scalar>("gamma", 1.4))
+    gamma_(dict.getOrDefault<scalar>("gamma", 1.4))
 {
     if
     (

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,15 +83,15 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
 )
 :
     partialSlipFvPatchVectorField(p, iF),
-    TName_(dict.lookupOrDefault<word>("T", "T")),
+    TName_(dict.getOrDefault<word>("T", "T")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    rhoName_(dict.getOrDefault<word>("rho", "rho")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.getOrDefault<word>("psi", "thermo:psi")),
-    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
+    muName_(dict.getOrDefault<word>("mu", "thermo:mu")),
-    tauMCName_(dict.lookupOrDefault<word>("tauMC", "tauMC")),
+    tauMCName_(dict.getOrDefault<word>("tauMC", "tauMC")),
     accommodationCoeff_(dict.get<scalar>("accommodationCoeff")),
     Uwall_("Uwall", dict, p.size()),
-    thermalCreep_(dict.lookupOrDefault("thermalCreep", true)),
+    thermalCreep_(dict.getOrDefault("thermalCreep", true)),
-    curvature_(dict.lookupOrDefault("curvature", true))
+    curvature_(dict.getOrDefault("curvature", true))
 {
     if
     (

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2012 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,8 +67,8 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    pName_(dict.lookupOrDefault<word>("p", "p")),
+    pName_(dict.getOrDefault<word>("p", "p")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi"))
+    psiName_(dict.getOrDefault<word>("psi", "thermo:psi"))
 {}
 
 

applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H

@@ -3,7 +3,7 @@
 
     scalar rDeltaTSmoothingCoeff
     (
-        runTime.controlDict().lookupOrDefault<scalar>
+        runTime.controlDict().getOrDefault<scalar>
         (
             "rDeltaTSmoothingCoeff",
             0.02

applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H

@@ -17,7 +17,7 @@
 
     const dictionary& eosDict = thermoDict.subDict("equationOfState");
 
-    bool local = eosDict.lookupOrDefault("local", false);
+    bool local = eosDict.getOrDefault("local", false);
 
     // Evolve T as:
     //

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/createControls.H

@@ -1,4 +1,4 @@
 bool ddtCorr
 (
-    pimple.dict().lookupOrDefault("ddtCorr", true)
+    pimple.dict().getOrDefault("ddtCorr", true)
 );

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/readControls.H

@@ -1,9 +1,9 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
 
 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);
 
 
-ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);

applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H

@@ -5,22 +5,22 @@
 
     scalar maxCo
     (
-        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.8)
+        pimpleDict.getOrDefault<scalar>("maxCo", 0.8)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     scalar maxDeltaT
     (
-        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFields.H

@@ -82,5 +82,5 @@ dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 bool adjustFringe
 (
-    simple.dict().lookupOrDefault("oversetAdjustPhi", false)
+    simple.dict().getOrDefault("oversetAdjustPhi", false)
 );

applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H

@@ -1,3 +1,3 @@
     const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
 
-    const int nBcorr = Bpiso.lookupOrDefault<int>("nCorrectors", 1);
+    const int nBcorr = Bpiso.getOrDefault<int>("nCorrectors", 1);

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/readControls.H

@@ -1,9 +1,9 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
 
 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);
 
 
-ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H

@@ -1,7 +1,7 @@
     const dictionary& simple = fluidRegions[i].solutionDict().subDict("SIMPLE");
 
     const int nNonOrthCorr =
-        simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+        simple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);
 
     const bool momentumPredictor =
-        simple.lookupOrDefault("momentumPredictor", true);
+        simple.getOrDefault("momentumPredictor", true);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H

@@ -1,4 +1,4 @@
 const dictionary& simple = mesh.solutionDict().subDict("SIMPLE");
 
 const int nNonOrthCorr =
-    simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+    simple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C

@@ -227,11 +227,11 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
     mixedFvPatchScalarField(p, iF),
     regionType_(regionTypeNames_.get("region", dict)),
     method_(KMethodTypeNames_.get("kappaMethod", dict)),
-    kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
+    kappaName_(dict.getOrDefault<word>("kappa", "none")),
     otherPhaseName_(dict.get<word>("otherPhase")),
-    TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
+    TnbrName_(dict.getOrDefault<word>("Tnbr", "T")),
-    qrNbrName_(dict.lookupOrDefault<word>("qrNbr", "none")),
+    qrNbrName_(dict.getOrDefault<word>("qrNbr", "none")),
-    qrName_(dict.lookupOrDefault<word>("qr", "none"))
+    qrName_(dict.getOrDefault<word>("qr", "none"))
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/readFluidMultiRegionPIMPLEControls.H

@@ -2,10 +2,10 @@
 
     Switch faceMomentum
     (
-        pimpleDict.lookupOrDefault<Switch>("faceMomentum", false)
+        pimpleDict.getOrDefault<Switch>("faceMomentum", false)
     );
 
     int nEnergyCorrectors
     (
-        pimpleDict.lookupOrDefault<int>("nEnergyCorrectors", 1)
+        pimpleDict.getOrDefault<int>("nEnergyCorrectors", 1)
     );

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H

@@ -1,10 +1,10 @@
     const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
 
     const int nCorr =
-        pimple.lookupOrDefault<int>("nCorrectors", 1);
+        pimple.getOrDefault<int>("nCorrectors", 1);
 
     const int nNonOrthCorr =
-        pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+        pimple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);
 
     const bool momentumPredictor =
-        pimple.lookupOrDefault("momentumPredictor", true);
+        pimple.getOrDefault("momentumPredictor", true);

applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H

@@ -5,4 +5,4 @@
     const dictionary& pimple = solutionDict.subDict("PIMPLE");
 
     const int nOuterCorr =
-        pimple.lookupOrDefault<int>("nOuterCorrectors", 1);
+        pimple.getOrDefault<int>("nOuterCorrectors", 1);

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H

@@ -1,4 +1,4 @@
 const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
 
 int nNonOrthCorr =
-    pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+    pimple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidTimeControls.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +32,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-scalar maxDi = runTime.controlDict().lookupOrDefault<scalar>("maxDi", 10.0);
+scalar maxDi = runTime.controlDict().getOrDefault<scalar>("maxDi", 10);
 
 // ************************************************************************* //

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/createControls.H

@@ -2,25 +2,25 @@
 
 bool correctPhi
 (
-    pimple.dict().lookupOrDefault("correctPhi", false)
+    pimple.dict().getOrDefault("correctPhi", false)
 );
 
 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+    pimple.dict().getOrDefault("checkMeshCourantNo", false)
 );
 
 bool massFluxInterpolation
 (
-    pimple.dict().lookupOrDefault("massFluxInterpolation", false)
+    pimple.dict().getOrDefault("massFluxInterpolation", false)
 );
 
 bool adjustFringe
 (
-    pimple.dict().lookupOrDefault("oversetAdjustPhi", false)
+    pimple.dict().getOrDefault("oversetAdjustPhi", false)
 );
 
 bool ddtCorr
 (
-    pimple.dict().lookupOrDefault("ddtCorr", true)
+    pimple.dict().getOrDefault("ddtCorr", true)
 );

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/readControls.H

@@ -1,10 +1,10 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
 
-checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
+checkMeshCourantNo = pimple.dict().getOrDefault("checkMeshCourantNo", false);
 
 massFluxInterpolation =
-    pimple.dict().lookupOrDefault("massFluxInterpolation", false);
+    pimple.dict().getOrDefault("massFluxInterpolation", false);
 
-ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);

applications/solvers/incompressible/simpleFoam/overSimpleFoam/createOversetFields.H

@@ -22,9 +22,9 @@
 
 bool adjustFringe
 (
-    simple.dict().lookupOrDefault("oversetAdjustPhi", false)
+    simple.dict().getOrDefault("oversetAdjustPhi", false)
 );
 bool massFluxInterpolation
 (
-    simple.dict().lookupOrDefault("massFluxInterpolation", false)
+    simple.dict().getOrDefault("massFluxInterpolation", false)
 );

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/setPorosityTreatment.H

@@ -5,7 +5,7 @@ int nUCorr = 0;
 if (pZones.active())
 {
     // nUCorrectors for pressureImplicitPorosity
-    nUCorr = simple.dict().lookupOrDefault<int>("nUCorrectors", 0);
+    nUCorr = simple.dict().getOrDefault<int>("nUCorrectors", 0);
 
     if (nUCorr > 0)
     {

applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,23 +35,23 @@ License
     scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
-    scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
+    scalar maxDeltaT(pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT));
 
     // Smoothing parameter (0-1) when smoothing iterations > 0
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     // Damping coefficient (1-0)
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
+        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
     );
 
     // Maximum change in cell temperature per iteration
     // (relative to previous value)
-    scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05));
+    scalar alphaTemp(pimpleDict.getOrDefault("alphaTemp", 0.05));
 
 
     Info<< "Time scales min/max:" << endl;

applications/solvers/lagrangian/reactingParcelFoam/createRegionControls.H

@@ -1,5 +1,5 @@
 bool solvePrimaryRegion
 (
-    pimple.dict().lookupOrDefault("solvePrimaryRegion", true)
+    pimple.dict().getOrDefault("solvePrimaryRegion", true)
 );
 

applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,23 +35,23 @@ License
     scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
-    scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
+    scalar maxDeltaT(pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT));
 
     // Smoothing parameter (0-1) when smoothing iterations > 0
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     // Damping coefficient (1-0)
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
+        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
     );
 
     // Maximum change in cell temperature per iteration
     // (relative to previous value)
-    scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05));
+    scalar alphaTemp(pimpleDict.getOrDefault("alphaTemp", 0.05));
 
 
     Info<< "Time scales min/max:" << endl;

applications/solvers/multiphase/VoF/setRDeltaT.H

@@ -5,52 +5,52 @@
 
     scalar maxCo
     (
-        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.9)
+        pimpleDict.getOrDefault<scalar>("maxCo", 0.9)
     );
 
     scalar maxAlphaCo
     (
-        pimpleDict.lookupOrDefault<scalar>("maxAlphaCo", 0.2)
+        pimpleDict.getOrDefault<scalar>("maxAlphaCo", 0.2)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     label nAlphaSpreadIter
     (
-        pimpleDict.lookupOrDefault<label>("nAlphaSpreadIter", 1)
+        pimpleDict.getOrDefault<label>("nAlphaSpreadIter", 1)
     );
 
     scalar alphaSpreadDiff
     (
-        pimpleDict.lookupOrDefault<scalar>("alphaSpreadDiff", 0.2)
+        pimpleDict.getOrDefault<scalar>("alphaSpreadDiff", 0.2)
     );
 
     scalar alphaSpreadMax
     (
-        pimpleDict.lookupOrDefault<scalar>("alphaSpreadMax", 0.99)
+        pimpleDict.getOrDefault<scalar>("alphaSpreadMax", 0.99)
     );
 
     scalar alphaSpreadMin
     (
-        pimpleDict.lookupOrDefault<scalar>("alphaSpreadMin", 0.01)
+        pimpleDict.getOrDefault<scalar>("alphaSpreadMin", 0.01)
     );
 
     label nAlphaSweepIter
     (
-        pimpleDict.lookupOrDefault<label>("nAlphaSweepIter", 5)
+        pimpleDict.getOrDefault<label>("nAlphaSweepIter", 5)
     );
 
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     scalar maxDeltaT
     (
-        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H

@@ -1,4 +1,4 @@
 #include "readDyMControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
+correctPhi = pimple.dict().getOrDefault("correctPhi", true);
 maxAcousticCo = runTime.controlDict().get<scalar>("maxAcousticCo");

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C

@@ -55,23 +55,23 @@ VoFPatchTransfer::VoFPatchTransfer
     transferModel(type(), film, dict),
     deltaFactorToVoF_
     (
-        coeffDict_.lookupOrDefault<scalar>("deltaFactorToVoF", 1.0)
+        coeffDict_.getOrDefault<scalar>("deltaFactorToVoF", 1.0)
     ),
     deltaFactorToFilm_
     (
-        coeffDict_.lookupOrDefault<scalar>("deltaFactorToFilm", 0.5)
+        coeffDict_.getOrDefault<scalar>("deltaFactorToFilm", 0.5)
     ),
     alphaToVoF_
     (
-        coeffDict_.lookupOrDefault<scalar>("alphaToVoF", 0.5)
+        coeffDict_.getOrDefault<scalar>("alphaToVoF", 0.5)
     ),
     alphaToFilm_
     (
-        coeffDict_.lookupOrDefault<scalar>("alphaToFilm", 0.1)
+        coeffDict_.getOrDefault<scalar>("alphaToFilm", 0.1)
     ),
     transferRateCoeff_
     (
-        coeffDict_.lookupOrDefault<scalar>("transferRateCoeff", 0.1)
+        coeffDict_.getOrDefault<scalar>("transferRateCoeff", 0.1)
     ),
     patchIDs_(),
     patchTransferredMasses_()

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -124,9 +125,9 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
     cellSetOption(sourceName, modelType, dict, mesh),
     alphaSolidT_(Function1<scalar>::New("alphaSolidT", coeffs_)),
     L_("L", dimEnergy/dimMass, coeffs_),
-    relax_(coeffs_.lookupOrDefault("relax", 0.9)),
+    relax_(coeffs_.getOrDefault("relax", 0.9)),
-    Cu_(coeffs_.lookupOrDefault<scalar>("Cu", 100000)),
+    Cu_(coeffs_.getOrDefault<scalar>("Cu", 100000)),
-    q_(coeffs_.lookupOrDefault("q", 0.001)),
+    q_(coeffs_.getOrDefault<scalar>("q", 0.001)),
     alphaSolid_
     (
         IOobject

applications/solvers/multiphase/driftFluxFoam/alphaControls.H

@@ -4,12 +4,12 @@ label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
 label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
-bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));
+bool MULESCorr(alphaControls.getOrDefault("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("alphaApplyPrevCorr", false)
+    alphaControls.getOrDefault("alphaApplyPrevCorr", false)
 );

applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,9 +89,9 @@ incompressibleTwoPhaseInteractingMixture
     (
         "d",
         dimLength,
-        muModel_->viscosityProperties().lookupOrDefault("d", 0.0)
+        muModel_->viscosityProperties().getOrDefault("d", 0.0)
     ),
-    alphaMax_(muModel_->viscosityProperties().lookupOrDefault("alphaMax", 1.0)),
+    alphaMax_(muModel_->viscosityProperties().getOrDefault("alphaMax", 1.0)),
 
     U_(U),
     phi_(phi),
@@ -132,11 +132,11 @@ bool Foam::incompressibleTwoPhaseInteractingMixture::read()
             (
                 "d",
                 dimLength,
-                muModel_->viscosityProperties().lookupOrDefault("d", 0)
+                muModel_->viscosityProperties().getOrDefault("d", 0)
             );
 
             alphaMax_ =
-                muModel_->viscosityProperties().lookupOrDefault
+                muModel_->viscosityProperties().getOrDefault
                 (
                     "alphaMax",
                     1.0

applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/plastic/plastic.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +69,7 @@ Foam::mixtureViscosityModels::plastic::plastic
         (
             IOobject::groupName
             (
-                viscosityProperties.lookupOrDefault<word>("alpha", "alpha"),
+                viscosityProperties.getOrDefault<word>("alpha", "alpha"),
                 viscosityProperties.dictName()
             )
         )

applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/slurry/slurry.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,7 +65,7 @@ Foam::mixtureViscosityModels::slurry::slurry
         (
             IOobject::groupName
             (
-                viscosityProperties.lookupOrDefault<word>("alpha", "alpha"),
+                viscosityProperties.getOrDefault<word>("alpha", "alpha"),
                 viscosityProperties.dictName()
             )
         )

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/alphaCourantNo.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,12 +39,12 @@ scalar maxAlphaCo
 
 scalar maxAlphaDdt
 (
-    runTime.controlDict().lookupOrDefault("maxAlphaDdt", GREAT)
+    runTime.controlDict().getOrDefault("maxAlphaDdt", GREAT)
 );
 
 scalar maxDi
 (
-    runTime.controlDict().lookupOrDefault<scalar>("maxDi", GREAT)
+    runTime.controlDict().getOrDefault<scalar>("maxDi", GREAT)
 );
 
 scalar alphaCoNum = 0.0;

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C

@@ -354,7 +354,7 @@ Foam::radiation::laserDTRM::laserDTRM(const volScalarField& T)
     focalLaserRadius_(get<scalar>("focalLaserRadius")),
     qualityBeamLaser_
     (
-        lookupOrDefault<scalar>("qualityBeamLaser", 0.0)
+        getOrDefault<scalar>("qualityBeamLaser", 0)
     ),
 
     sigma_(0),
@@ -364,7 +364,7 @@ Foam::radiation::laserDTRM::laserDTRM(const volScalarField& T)
 
     reflectionSwitch_(false),
 
-    alphaCut_(lookupOrDefault<scalar>("alphaCut", 0.5)),
+    alphaCut_(getOrDefault<scalar>("alphaCut", 0.5)),
 
     a_
     (
@@ -451,7 +451,7 @@ Foam::radiation::laserDTRM::laserDTRM
     focalLaserRadius_(get<scalar>("focalLaserRadius")),
     qualityBeamLaser_
     (
-        lookupOrDefault<scalar>("qualityBeamLaser", 0.0)
+        getOrDefault<scalar>("qualityBeamLaser", 0)
     ),
 
     sigma_(0),
@@ -461,7 +461,7 @@ Foam::radiation::laserDTRM::laserDTRM
 
     reflectionSwitch_(false),
 
-    alphaCut_(lookupOrDefault<scalar>("alphaCut", 0.5)),
+    alphaCut_(getOrDefault<scalar>("alphaCut", 0.5)),
 
     a_
     (

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.C

@@ -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.
@@ -41,7 +41,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::Lee
     InterfaceCompositionModel<Thermo, OtherThermo>(dict, pair),
     C_("C", inv(dimTime), dict),
     Tactivate_("Tactivate", dimTemperature, dict),
-    alphaMin_(dict.lookupOrDefault<scalar>("alphaMin", 0))
+    alphaMin_(dict.getOrDefault<scalar>("alphaMin", 0))
 {}
 
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C

@@ -58,16 +58,16 @@ Foam::interfaceCompositionModel::interfaceCompositionModel
 :
     modelVariable_
     (
-        modelVariableNames.lookupOrDefault
+        modelVariableNames.getOrDefault
         (
             "variable",
             dict,
             modelVariable::T
         )
     ),
-    includeVolChange_(dict.lookupOrDefault("includeVolChange", true)),
+    includeVolChange_(dict.getOrDefault("includeVolChange", true)),
     pair_(pair),
-    speciesName_(dict.lookupOrDefault<word>("species", "none")),
+    speciesName_(dict.getOrDefault<word>("species", "none")),
     mesh_(pair_.from().mesh())
 {}
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C

@@ -178,8 +178,8 @@ Foam::meltingEvaporationModels::interfaceHeatResistance<Thermo, OtherThermo>
         this->mesh_,
         dimensionedScalar(dimMass/dimArea/dimTemperature/dimTime, Zero)
     ),
-    isoAlpha_(dict.lookupOrDefault<scalar>("isoAlpha", 0.5)),
+    isoAlpha_(dict.getOrDefault<scalar>("isoAlpha", 0.5)),
-    spread_(dict.lookupOrDefault<scalar>("spread", 3))
+    spread_(dict.getOrDefault<scalar>("spread", 3))
 {}
 
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C

@@ -161,7 +161,7 @@ Foam::meltingEvaporationModels::kineticGasEvaporation<Thermo, OtherThermo>
         this->mesh_,
         dimensionedScalar(dimDensity/dimTime, Zero)
     ),
-    isoAlpha_(dict.lookupOrDefault<scalar>("isoAlpha", 0.5))
+    isoAlpha_(dict.getOrDefault<scalar>("isoAlpha", 0.5))
 {
     word speciesName = IOobject::member(this->transferSpecie());
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C

@@ -313,7 +313,7 @@ void Foam::MultiComponentPhaseModel<BasePhaseModel, phaseThermo>::solveYi
 
     scalar nYiSubCycles
     (
-        MULEScontrols.lookupOrDefault<scalar>("nYiSubCycles", 1)
+        MULEScontrols.getOrDefault<scalar>("nYiSubCycles", 1)
     );
 
     forAll(X_, i)

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C

@@ -250,7 +250,7 @@ Foam::phaseSystem::phaseSystem
     totalPhasePairs_(),
     Prt_
     (
-        dimensionedScalar::lookupOrAddToDict
+        dimensionedScalar::getOrAddToDict
         (
             "Prt", *this, 1.0
         )

applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H

@@ -1,30 +1,30 @@
 bool correctPhi
 (
-    pimple.dict().lookupOrDefault("correctPhi", true)
+    pimple.dict().getOrDefault("correctPhi", true)
 );
 
 bool checkMeshCourantNo
 (
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+    pimple.dict().getOrDefault("checkMeshCourantNo", false)
 );
 
 bool moveMeshOuterCorrectors
 (
-    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
+    pimple.dict().getOrDefault("moveMeshOuterCorrectors", false)
 );
 
 
 bool massFluxInterpolation
 (
-    pimple.dict().lookupOrDefault("massFluxInterpolation", false)
+    pimple.dict().getOrDefault("massFluxInterpolation", false)
 );
 
 bool adjustFringe
 (
-    pimple.dict().lookupOrDefault("oversetAdjustPhi", false)
+    pimple.dict().getOrDefault("oversetAdjustPhi", false)
 );
 
 bool ddtCorr
 (
-    pimple.dict().lookupOrDefault("ddtCorr", true)
+    pimple.dict().getOrDefault("ddtCorr", true)
 );

applications/solvers/multiphase/interFoam/overInterDyMFoam/readControls.H

@@ -1,16 +1,16 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
 
 checkMeshCourantNo =
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);
 
 moveMeshOuterCorrectors =
-    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false);
+    pimple.dict().getOrDefault("moveMeshOuterCorrectors", false);
 
 massFluxInterpolation =
-    pimple.dict().lookupOrDefault("massFluxInterpolation", false);
+    pimple.dict().getOrDefault("massFluxInterpolation", false);
 
-ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);
 
-adjustFringe =  pimple.dict().lookupOrDefault("oversetAdjustPhi", false);
+adjustFringe =  pimple.dict().getOrDefault("oversetAdjustPhi", false);

applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H

@@ -4,18 +4,18 @@ label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
 label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
-bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));
+bool MULESCorr(alphaControls.getOrDefault("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("alphaApplyPrevCorr", false)
+//    alphaControls.getOrDefault("alphaApplyPrevCorr", false)
 //);
 
 // Isotropic compression coefficient
 scalar icAlpha
 (
-    alphaControls.lookupOrDefault<scalar>("icAlpha", 0)
+    alphaControls.getOrDefault<scalar>("icAlpha", 0)
 );

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C

@@ -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 @@ int main(int argc, char *argv[])
 
     scalar slamDampCoeff
     (
-        fluid.lookupOrDefault<scalar>("slamDampCoeff", 1)
+        fluid.getOrDefault<scalar>("slamDampCoeff", 1)
     );
 
     dimensionedScalar maxSlamVelocity

applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2019 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -362,7 +362,7 @@ Foam::functionObjects::sizeDistribution::sizeDistribution
     nCells_(0),
     cellId_(),
     volume_(0.0),
-    writeVolume_(dict.lookupOrDefault("writeVolume", false)),
+    writeVolume_(dict.getOrDefault("writeVolume", false)),
     popBal_
     (
         obr_.lookupObject<Foam::diameterModels::populationBalanceModel>
@@ -371,8 +371,8 @@ Foam::functionObjects::sizeDistribution::sizeDistribution
         )
     ),
     N_(popBal_.sizeGroups().size()),
-    momentOrder_(dict.lookupOrDefault<label>("momentOrder", 0)),
+    momentOrder_(dict.getOrDefault<label>("momentOrder", 0)),
-    normalize_(dict.lookupOrDefault("normalize", false)),
+    normalize_(dict.getOrDefault("normalize", false)),
     sumN_(0.0),
     sumV_(0.0)
 {

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,11 +66,11 @@ int main(int argc, char *argv[])
 
     Switch faceMomentum
     (
-        pimple.dict().lookupOrDefault<Switch>("faceMomentum", false)
+        pimple.dict().getOrDefault<Switch>("faceMomentum", false)
     );
     Switch partialElimination
     (
-        pimple.dict().lookupOrDefault<Switch>("partialElimination", false)
+        pimple.dict().getOrDefault<Switch>("partialElimination", false)
     );
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -82,7 +83,7 @@ int main(int argc, char *argv[])
 
         int nEnergyCorrectors
         (
-            pimple.dict().lookupOrDefault<int>("nEnergyCorrectors", 1)
+            pimple.dict().getOrDefault<int>("nEnergyCorrectors", 1)
         );
 
         if (LTS)

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H

@@ -5,17 +5,17 @@
 
     scalar maxCo
     (
-        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.2)
+        pimpleDict.getOrDefault<scalar>("maxCo", 0.2)
     );
 
     scalar maxDeltaT
     (
-        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     surfaceScalarField maxPhi("maxPhi", phi);

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
 
     bool faceMomentum
     (
-        pimple.dict().lookupOrDefault("faceMomentum", false)
+        pimple.dict().getOrDefault("faceMomentum", false)
     );
 
     #include "pUf/createRDeltaTf.H"
@@ -90,7 +91,7 @@ int main(int argc, char *argv[])
 
         int nEnergyCorrectors
         (
-            pimple.dict().lookupOrDefault<int>("nEnergyCorrectors", 1)
+            pimple.dict().getOrDefault<int>("nEnergyCorrectors", 1)
         );
 
         if (LTS)

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H

@@ -5,17 +5,17 @@
 
     scalar maxCo
     (
-        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.2)
+        pimpleDict.getOrDefault<scalar>("maxCo", 0.2)
     );
 
     scalar maxDeltaT
     (
-        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
+        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     // Set the reciprocal time-step from the local Courant number

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,12 +69,12 @@ int main(int argc, char *argv[])
 
     bool faceMomentum
     (
-        pimple.dict().lookupOrDefault("faceMomentum", false)
+        pimple.dict().getOrDefault("faceMomentum", false)
     );
 
     bool implicitPhasePressure
     (
-        mesh.solverDict(alpha1.name()).lookupOrDefault
+        mesh.solverDict(alpha1.name()).getOrDefault
         (
             "implicitPhasePressure", false
         )

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,7 +75,7 @@ Foam::phaseModel::phaseModel
         dimless,
         fluid.subDict(phaseName)
     ),
-    alphaMax_(phaseDict_.lookupOrDefault<scalar>("alphaMax", 1)),
+    alphaMax_(phaseDict_.getOrDefault<scalar>("alphaMax", 1)),
     thermo_(rhoThermo::New(fluid.mesh(), name_)),
     U_
     (

applications/solvers/stressAnalysis/solidDisplacementFoam/createControls.H

@@ -1,5 +1,5 @@
 #include "createControl.H"
 
-int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
+int nCorr = stressControl.getOrDefault<int>("nCorrectors", 1);
 
 scalar convergenceTolerance(stressControl.get<scalar>("D"));

applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H

@@ -1,3 +1,3 @@
-nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
+nCorr = stressControl.getOrDefault<int>("nCorrectors", 1);
 convergenceTolerance = stressControl.get<scalar>("D");
 compactNormalStress = stressControl.get<bool>("compactNormalStress");

applications/test/PatchFunction1/MappedField.C

@@ -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.
@@ -41,12 +41,12 @@ Foam::PatchFunction1Types::MappedField<Type>::MappedField
 :
     PatchFunction1<Type>(pp, entryName, dict),
     fieldTableName_(entryName),
-    setAverage_(dict.lookupOrDefault("setAverage", false)),
+    setAverage_(dict.getOrDefault("setAverage", false)),
-    perturb_(dict.lookupOrDefault("perturb", 1e-5)),
+    perturb_(dict.getOrDefault<scalar>("perturb", 1e-5)),
-    pointsName_(dict.lookupOrDefault<word>("points", "points")),
+    pointsName_(dict.getOrDefault<word>("points", "points")),
     mapMethod_
     (
-        dict.lookupOrDefault<word>
+        dict.getOrDefault<word>
         (
             "mapMethod",
             "planarInterpolation"

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C

@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
     const ExtrudeMode mode = ExtrudeModeNames.get("constructFrom", dict);
 
     // Any merging of small edges
-    const scalar mergeTol(dict.lookupOrDefault<scalar>("mergeTol", 1e-4));
+    const scalar mergeTol(dict.getOrDefault<scalar>("mergeTol", 1e-4));
 
     Info<< "Extruding from " << ExtrudeModeNames[mode]
         << " using model " << model().type() << endl;

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -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.
@@ -1498,7 +1498,7 @@ int main(int argc, char *argv[])
     word oneDPatchType(emptyPolyPatch::typeName);
     if (oneD)
     {
-        oneDNonManifoldEdges = dict.lookupOrDefault("nonManifold", false);
+        oneDNonManifoldEdges = dict.getOrDefault("nonManifold", false);
         oneDPatchType = dict.get<word>("oneDPolyPatchType");
     }
 

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -310,7 +311,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE
         ),
         foamyHexMeshDict.subDict("geometry"),
-        foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
+        foamyHexMeshDict.getOrDefault("singleRegionName", true)
     );
 
     conformationSurfaces geometryToConformTo

applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,12 +76,12 @@ Foam::cv2DControls::cv2DControls
 
     objOutput_
     (
-        motionControl_.lookupOrDefault<Switch>("objOutput", false)
+        motionControl_.getOrDefault<Switch>("objOutput", false)
     ),
 
     meshedSurfaceOutput_
     (
-        motionControl_.lookupOrDefault<Switch>("meshedSurfaceOutput", false)
+        motionControl_.getOrDefault<Switch>("meshedSurfaceOutput", false)
     ),
 
     randomiseInitialGrid_

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -806,7 +806,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
     spanScale_(coeffsDict.get<scalar>("spanScale")),
     minCellSizeLimit_
     (
-        coeffsDict.lookupOrDefault<scalar>("minCellSizeLimit", 0.0)
+        coeffsDict.getOrDefault<scalar>("minCellSizeLimit", 0)
     ),
     minLevels_(coeffsDict.get<label>("minLevels")),
     volRes_(coeffsDict.get<label>("sampleResolution")),

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,10 +37,10 @@ Foam::cellAspectRatioControl::cellAspectRatioControl
 )
 :
     aspectRatioDict_(motionDict.subOrEmptyDict("cellAspectRatioControl")),
-    aspectRatio_(aspectRatioDict_.lookupOrDefault<scalar>("aspectRatio", 1.0)),
+    aspectRatio_(aspectRatioDict_.getOrDefault<scalar>("aspectRatio", 1)),
     aspectRatioDirection_
     (
-        aspectRatioDict_.lookupOrDefault<vector>
+        aspectRatioDict_.getOrDefault<vector>
         (
             "aspectRatioDirection",
             Zero

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,7 @@ Foam::cellSizeAndAlignmentControl::cellSizeAndAlignmentControl
     defaultCellSize_(defaultCellSize),
     forceInitialPointInsertion_
     (
-        dict.lookupOrDefault<Switch>
+        dict.getOrDefault<Switch>
         (
             "forceInitialPointInsertion",
             Switch::OFF

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -169,7 +170,7 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
         geometryToConformTo,
         defaultCellSize
     ),
-    surfaceName_(controlFunctionDict.lookupOrDefault<word>("surface", name)),
+    surfaceName_(controlFunctionDict.getOrDefault<word>("surface", name)),
     searchableSurface_(geometryToConformTo.geometry()[surfaceName_]),
     geometryToConformTo_(geometryToConformTo),
     cellSizeFunctions_(1),

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,7 +71,7 @@ Foam::fieldFromFile::fieldFromFile
     ),
     cellSizeMultipleCoeff_
     (
-        coeffsDict_.lookupOrDefault<scalar>("cellSizeMultipleCoeff", 1)
+        coeffsDict_.getOrDefault<scalar>("cellSizeMultipleCoeff", 1)
     )
 {}
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ Foam::surfaceCellSizeFunction::surfaceCellSizeFunction
     defaultCellSize_(defaultCellSize),
     refinementFactor_
     (
-        lookupOrDefault<scalar>("refinementFactor", 1.0)
+        getOrDefault<scalar>("refinementFactor", 1)
     )
 {}
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -840,7 +841,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
             IOobject::NO_WRITE
         ),
         foamyHexMeshDict.subDict("geometry"),
-        foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
+        foamyHexMeshDict.getOrDefault("singleRegionName", true)
     ),
     geometryToConformTo_
     (

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1716,7 +1716,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
     forAll(procNeighbours, patchi)
     {
         procNeighbours[patchi] =
-            patchDicts[patchi].lookupOrDefault<label>("neighbProcNo", -1);
+            patchDicts[patchi].getOrDefault<label>("neighbProcNo", -1);
     }
 
     List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
@@ -2338,7 +2338,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
             if (patchFaces[nbI].size() > 0)
             {
                 const label neighbour =
-                    patchDicts[nbI].lookupOrDefault<label>("neighbProcNo", -1);
+                    patchDicts[nbI].getOrDefault<label>("neighbProcNo", -1);
 
                 faceList procPatchFaces = patchFaces[nbI];
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -134,7 +135,7 @@ void Foam::conformationSurfaces::readFeatures
 )
 {
     const word featureMethod =
-        featureDict.lookupOrDefault<word>("featureMethod", "none");
+        featureDict.getOrDefault<word>("featureMethod", "none");
 
     if (featureMethod == "extendedFeatureEdgeMesh")
     {
@@ -217,7 +218,7 @@ void Foam::conformationSurfaces::readFeatures
 )
 {
     const word featureMethod =
-        featureDict.lookupOrDefault<word>("featureMethod", "none");
+        featureDict.getOrDefault<word>("featureMethod", "none");
 
     if (featureMethod == "extendedFeatureEdgeMesh")
     {
@@ -380,7 +381,7 @@ Foam::conformationSurfaces::conformationSurfaces
             (
                 extendedFeatureEdgeMesh::sideVolumeTypeNames_
                 [
-                    dict.lookupOrDefault<word>
+                    dict.getOrDefault<word>
                     (
                         "meshableSide",
                         "inside"
@@ -452,7 +453,7 @@ Foam::conformationSurfaces::conformationSurfaces
                             regionI,
                             extendedFeatureEdgeMesh::sideVolumeTypeNames_
                             [
-                                 regionDict.lookupOrDefault<word>
+                                 regionDict.getOrDefault<word>
                                  (
                                      "meshableSide",
                                      extendedFeatureEdgeMesh::

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,13 +132,13 @@ Foam::cvControls::cvControls
         motionDict.get<scalar>("minimumCellSizeCoeff")*defaultCellSize_;
 
     objOutput_ =
-        motionDict.lookupOrDefault<Switch>("objOutput", false);
+        motionDict.getOrDefault<Switch>("objOutput", false);
 
     timeChecks_ =
-        motionDict.lookupOrDefault<Switch>("timeChecks", false);
+        motionDict.getOrDefault<Switch>("timeChecks", false);
 
     printVertexInfo_ =
-        motionDict.lookupOrDefault<Switch>("printVertexInfo", false);
+        motionDict.getOrDefault<Switch>("printVertexInfo", false);
 
     if (Pstream::parRun())
     {
@@ -190,10 +191,10 @@ Foam::cvControls::cvControls
     );
 
     filterEdges_ =
-        filteringDict.lookupOrDefault<Switch>("filterEdges", true);
+        filteringDict.getOrDefault<Switch>("filterEdges", true);
 
     filterFaces_ =
-        filteringDict.lookupOrDefault<Switch>("filterFaces", false);
+        filteringDict.getOrDefault<Switch>("filterFaces", false);
 
     if (filterFaces_)
     {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -884,14 +884,14 @@ autoDensity::autoDensity
     globalTrialPoints_(0),
     minCellSizeLimit_
     (
-        detailsDict().lookupOrDefault<scalar>("minCellSizeLimit", 0.0)
+        detailsDict().getOrDefault<scalar>("minCellSizeLimit", 0)
     ),
     minLevels_(detailsDict().get<label>("minLevels")),
     maxSizeRatio_(detailsDict().get<scalar>("maxSizeRatio")),
     volRes_(detailsDict().get<label>("sampleResolution")),
     surfRes_
     (
-        detailsDict().lookupOrDefault<label>("surfaceSampleResolution", volRes_)
+        detailsDict().getOrDefault<label>("surfaceSampleResolution", volRes_)
     )
 {
     if (maxSizeRatio_ <= 1.0)

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,7 +59,7 @@ Foam::searchableBoxFeatures::searchableBoxFeatures
     (
         extendedFeatureEdgeMesh::sideVolumeTypeNames_
         [
-            dict.lookupOrDefault<word>("meshableSide", "inside")
+            dict.getOrDefault<word>("meshableSide", "inside")
         ]
     )
 {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,7 +88,7 @@ Foam::searchablePlateFeatures::searchablePlateFeatures
     (
         extendedFeatureEdgeMesh::sideVolumeTypeNames_
         [
-            dict.lookupOrDefault<word>("meshableSide", "inside")
+            dict.getOrDefault<word>("meshableSide", "inside")
         ]
     )
 {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/triSurfaceMeshFeatures.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,7 @@ Foam::triSurfaceMeshFeatures::triSurfaceMeshFeatures
     (
         extendedFeatureEdgeMesh::sideVolumeTypeNames_
         [
-            dict.lookupOrDefault<word>("meshableSide", "inside")
+            dict.getOrDefault<word>("meshableSide", "inside")
         ]
     )
 {

applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C

@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
                 IOobject::NO_WRITE
             ),
             foamyHexMeshDict.subDict("geometry"),
-            foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
+            foamyHexMeshDict.getOrDefault("singleRegionName", true)
         );
 
         // Write some stats

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C

@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE
         ),
         foamyHexMeshDict.subDict("geometry"),
-        foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
+        foamyHexMeshDict.getOrDefault("singleRegionName", true)
     );
 
     Random rndGen(64293*Pstream::myProcNo());

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C

@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE
         ),
         foamyHexMeshDict.subDict("geometry"),
-        foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
+        foamyHexMeshDict.getOrDefault("singleRegionName", true)
     );
 
     Info<< "Geometry read in = "

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C

@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE
         ),
         foamyHexMeshDict.subDict("geometry"),
-        foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
+        foamyHexMeshDict.getOrDefault("singleRegionName", true)
     );
 
     Info<< "Geometry read in = "

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -125,7 +126,7 @@ Foam::CV2D::CV2D
             IOobject::NO_WRITE
         ),
         cvMeshDict.subDict("geometry"),
-        cvMeshDict.lookupOrDefault("singleRegionName", true)
+        cvMeshDict.getOrDefault("singleRegionName", true)
     ),
     qSurf_
     (

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -157,7 +158,7 @@ Foam::shortEdgeFilter2D::shortEdgeFilter2D
     shortEdgeFilterFactor_(dict.get<scalar>("shortEdgeFilterFactor")),
     edgeAttachedToBoundaryFactor_
     (
-        dict.lookupOrDefault<scalar>("edgeAttachedToBoundaryFactor", 2.0)
+        dict.getOrDefault<scalar>("edgeAttachedToBoundaryFactor", 2.0)
     ),
     patchNames_(wordList()),
     patchSizes_(labelList()),

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -853,12 +853,12 @@ int main(int argc, char *argv[])
         dryRun
     );
 
-    const bool keepPatches(meshDict.lookupOrDefault("keepPatches", false));
+    const bool keepPatches(meshDict.getOrDefault("keepPatches", false));
 
     // format to be used for writing lines
     const word setFormat
     (
-        meshDict.lookupOrDefault
+        meshDict.getOrDefault<word>
         (
             "setFormat",
             vtkSetWriter<scalar>::typeName
@@ -871,7 +871,7 @@ int main(int argc, char *argv[])
 
     const scalar maxSizeRatio
     (
-        meshDict.lookupOrDefault<scalar>("maxSizeRatio", 100.0)
+        meshDict.getOrDefault<scalar>("maxSizeRatio", 100)
     );
 
 
@@ -919,7 +919,7 @@ int main(int argc, char *argv[])
     // Set debug level
     meshRefinement::debugType debugLevel = meshRefinement::debugType
     (
-        meshDict.lookupOrDefault<label>
+        meshDict.getOrDefault<label>
         (
             "debug",
             0
@@ -1004,7 +1004,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE
         ),
         geometryDict,
-        meshDict.lookupOrDefault("singleRegionName", true)
+        meshDict.getOrDefault("singleRegionName", true)
     );
 
 
@@ -1059,7 +1059,7 @@ int main(int argc, char *argv[])
                 allGeometry,
                 conformationDict,
                 shapeControlDict,
-                refineDict.lookupOrDefault("gapLevelIncrement", 0),
+                refineDict.getOrDefault("gapLevelIncrement", 0),
                 initialCellSize/defaultCellSize
             );
 
@@ -1078,7 +1078,7 @@ int main(int argc, char *argv[])
                     "refinementSurfaces",
                     dryRun
                 ),
-                refineDict.lookupOrDefault("gapLevelIncrement", 0),
+                refineDict.getOrDefault("gapLevelIncrement", 0),
                 dryRun
             )
         );
@@ -1714,7 +1714,7 @@ int main(int argc, char *argv[])
     {
         const bool mergePatchFaces
         (
-            meshDict.lookupOrDefault("mergePatchFaces", true)
+            meshDict.getOrDefault("mergePatchFaces", true)
         );
 
         if (!mergePatchFaces)
@@ -1728,7 +1728,7 @@ int main(int argc, char *argv[])
         {
             const bool mergeAcrossPatches
             (
-                meshDict.lookupOrDefault("mergeAcrossPatches", false)
+                meshDict.getOrDefault("mergeAcrossPatches", false)
             );
 
             if (mergeAcrossPatches)

applications/utilities/mesh/manipulation/createBaffles/createBaffles.C

@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
         IOdictionary dict(dictIO);
 
         internalFacesOnly = dict.get<bool>("internalFacesOnly");
-        noFields = dict.lookupOrDefault("noFields", false);
+        noFields = dict.getOrDefault("noFields", false);
 
         const dictionary& selectionsDict = dict.subDict("baffles");
 
@@ -735,7 +735,7 @@ int main(int argc, char *argv[])
                 // (ie 3D thermal baffles)
 
                 const bool sameGroup =
-                    patchSource.lookupOrDefault("sameGroup", true);
+                    patchSource.getOrDefault("sameGroup", true);
 
                 if (!sameGroup)
                 {
@@ -915,7 +915,7 @@ int main(int argc, char *argv[])
                 const dictionary& patchSource = dict.subDict("patchPairs");
 
                 const bool sameGroup =
-                    patchSource.lookupOrDefault("sameGroup", true);
+                    patchSource.getOrDefault("sameGroup", true);
 
                 const word& groupName = selectors[selectorI].name();
 

applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-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 @@ Foam::faceSelection::faceSelection
     name_(name),
     mesh_(mesh),
     dict_(dict),
-    flip_(dict.lookupOrDefault("flip", false))
+    flip_(dict.getOrDefault("flip", false))
 {}
 
 

applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,7 +67,7 @@ Foam::faceSelections::searchableSurfaceSelection::searchableSurfaceSelection
             dict.get<word>("surface"),
             IOobject
             (
-                dict.lookupOrDefault("name", mesh.objectRegistry::db().name()),
+                dict.getOrDefault("name", mesh.objectRegistry::db().name()),
                 mesh.time().constant(),
                 "triSurface",
                 mesh.objectRegistry::db(),

applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C

@@ -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.
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
 
     bool moveMeshOuterCorrectors
     (
-        pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
+        pimple.dict().getOrDefault("moveMeshOuterCorrectors", false)
     );
 
     while (runTime.loop())

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -714,7 +714,7 @@ int main(int argc, char *argv[])
 
         renumberPtr = renumberMethod::New(renumberDict);
 
-        sortCoupledFaceCells = renumberDict.lookupOrDefault
+        sortCoupledFaceCells = renumberDict.getOrDefault
         (
             "sortCoupledFaceCells",
             false
@@ -725,7 +725,7 @@ int main(int argc, char *argv[])
                 << endl;
         }
 
-        blockSize = renumberDict.lookupOrDefault("blockSize", 0);
+        blockSize = renumberDict.getOrDefault("blockSize", 0);
         if (blockSize > 0)
         {
             Info<< "Ordering cells into regions of size " << blockSize
@@ -743,7 +743,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        orderPoints = renumberDict.lookupOrDefault("orderPoints", false);
+        orderPoints = renumberDict.getOrDefault("orderPoints", false);
         if (orderPoints)
         {
             Info<< "Ordering points into internal and boundary points." << nl

applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H

@@ -15,4 +15,4 @@ const label sampleFrequency(propsDict.get<label>("sampleFrequency"));
 
 const label maxPositions(propsDict.get<label>("maxPositions"));
 
-const word setFormat(propsDict.lookupOrDefault<word>("setFormat", "vtk"));
+const word setFormat(propsDict.getOrDefault<word>("setFormat", "vtk"));

applications/utilities/preProcessing/setAlphaField/setAlphaField.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 DHI
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
     isoCutCell icc(mesh, f);
     icc.volumeOfFluid(alpha1, f0);
 
-    if (dict.lookupOrDefault("invertAlpha", false))
+    if (dict.getOrDefault("invertAlpha", false))
     {
         alpha1 = 1 - alpha1;
     }

applications/utilities/preProcessing/viewFactorsGen/shootRays.H

@@ -4,7 +4,7 @@
 // Maximum length for dynamicList
 const label maxDynListLength
 (
-    viewFactorDict.lookupOrDefault<label>("maxDynListLength", 100000)
+    viewFactorDict.getOrDefault<label>("maxDynListLength", 100000)
 );
 
 for (label proci = 0; proci < Pstream::nProcs(); proci++)

applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -281,12 +281,12 @@ int main(int argc, char *argv[])
     const word viewFactorWall("viewFactorWall");
 
     const bool writeViewFactors =
-        viewFactorDict.lookupOrDefault("writeViewFactorMatrix", false);
+        viewFactorDict.getOrDefault("writeViewFactorMatrix", false);
 
     const bool dumpRays =
-        viewFactorDict.lookupOrDefault("dumpRays", false);
+        viewFactorDict.getOrDefault("dumpRays", false);
 
-    const label debug = viewFactorDict.lookupOrDefault<label>("debug", 0);
+    const label debug = viewFactorDict.getOrDefault<label>("debug", 0);
 
     // Read agglomeration map
     labelListIOList finalAgglom

applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C

@@ -272,7 +272,7 @@ int main(int argc, char *argv[])
         // We don't needs the intersectionMethod yet, but can use it
         // for setting a reasonable loading option
         const surfaceIntersection::intersectionType selfIntersect =
-            surfaceIntersection::selfIntersectionNames.lookupOrDefault
+            surfaceIntersection::selfIntersectionNames.getOrDefault
             (
                 "intersectionMethod",
                 surfaceDict,
@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
 
         // Loading option - default depends on context
         triSurfaceLoader::loadingOption loadingOption =
-            triSurfaceLoader::loadingOptionNames.lookupOrDefault
+            triSurfaceLoader::loadingOptionNames.getOrDefault
             (
                 "loadingOption",
                 surfaceDict,
@@ -384,9 +384,9 @@ int main(int argc, char *argv[])
             const dictionary& trimDict = surfaceDict.subDict("trimFeatures");
 
             const scalar minLen =
-                trimDict.lookupOrDefault<scalar>("minLen", 0);
+                trimDict.getOrDefault<scalar>("minLen", 0);
             const label minElem =
-                trimDict.lookupOrDefault<label>("minElem", 0);
+                trimDict.getOrDefault<label>("minElem", 0);
 
             // Trim away small groups of features
             if (minLen > 0 || minElem > 0)
@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
             }
 
             // Suboption: "nonManifoldEdges" (false: remove non-manifold edges)
-            if (!subsetDict.lookupOrDefault("nonManifoldEdges", true))
+            if (!subsetDict.getOrDefault("nonManifoldEdges", true))
             {
                 Info<< "Removing all non-manifold edges"
                     << " (edges with > 2 connected faces) unless they"
@@ -476,7 +476,7 @@ int main(int argc, char *argv[])
             }
 
             // Suboption: "openEdges" (false: remove open edges)
-            if (!subsetDict.lookupOrDefault("openEdges", true))
+            if (!subsetDict.getOrDefault("openEdges", true))
             {
                 Info<< "Removing all open edges"
                     << " (edges with 1 connected face)" << endl;
@@ -656,13 +656,13 @@ int main(int argc, char *argv[])
         // Output information
 
         const bool optCloseness =
-            surfaceDict.lookupOrDefault("closeness", false);
+            surfaceDict.getOrDefault("closeness", false);
 
         const bool optProximity =
-            surfaceDict.lookupOrDefault("featureProximity", false);
+            surfaceDict.getOrDefault("featureProximity", false);
 
         const bool optCurvature =
-            surfaceDict.lookupOrDefault("curvature", false);
+            surfaceDict.getOrDefault("curvature", false);
 
 
         // For VTK legacy format, we would need an a priori count of
@@ -723,7 +723,7 @@ int main(int argc, char *argv[])
         if (optCloseness)
         {
             const scalar maxProximity =
-                surfaceDict.lookupOrDefault<scalar>("maxFeatureProximity", 1);
+                surfaceDict.getOrDefault<scalar>("maxFeatureProximity", 1);
 
             tmp<scalarField> tproximity =
                 edgeMeshTools::writeFeatureProximity

applications/utilities/surface/surfacePatch/surfacePatch.C

@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE
         ),
         meshDict.subDict("geometry"),
-        meshDict.lookupOrDefault("singleRegionName", true)
+        meshDict.getOrDefault("singleRegionName", true)
     );