From d987648ef433a2518c2f0cfc2dbe3aba69f84c60 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Wed, 27 Nov 2019 11:38:59 +0000
Subject: [PATCH] dictionary label lookup: simplified syntax using the type
 templated lookup function

Replaced
    readLabel(dict.lookup("name"))
with
    dict.lookup<label>("name)
---
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |  2 +-
 .../multiphaseMixtureThermo.C                 |  2 +-
 .../multiphase/driftFluxFoam/alphaControls.H  |  4 ++--
 .../interFoam/interMixingFoam/alphaControls.H |  4 ++--
 .../interPhaseChangeFoam/alphaControls.H      |  4 ++--
 .../multiphaseSystem/multiphaseSystem.C       |  4 ++--
 .../multiphaseMixture/multiphaseMixture.C     |  4 ++--
 .../populationBalanceModelI.H                 |  2 +-
 .../multiphaseSystem/multiphaseSystem.C       |  2 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  4 ++--
 .../twoLiquidMixingFoam/alphaControls.H       |  2 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  6 ++---
 applications/test/Function1/Test-Function1.C  |  2 +-
 .../advanced/autoRefineMesh/autoRefineMesh.C  |  8 +++----
 .../cv2DControls/cv2DControls.C               |  2 +-
 .../backgroundMeshDecomposition.C             |  4 ++--
 .../fileControl/fileControl.C                 |  4 ++--
 .../cellSizeFunction/cellSizeFunction.C       |  4 ++--
 .../conformalVoronoiMeshCalcDualMesh.C        |  6 ++---
 .../conformalVoronoiMeshIO.C                  | 22 +++++++++----------
 .../cvControls/cvControls.C                   |  4 ++--
 .../autoDensity/autoDensity.C                 |  4 ++--
 .../decomposePar/decomposePar.C               |  4 ++--
 .../PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C |  2 +-
 .../lagrangian/particleTracks/createFields.H  |  4 ++--
 .../miscellaneous/pdfPlot/createFields.H      |  4 ++--
 .../foamUpgradeCyclics/foamUpgradeCyclics.C   | 10 ++++-----
 .../preProcessing/mapFields/mapFields.C       | 14 ++++++------
 .../functionObject/FUNCTIONOBJECT.C           |  2 +-
 src/OpenFOAM/db/dictionary/dictionary.H       |  2 +-
 .../db/dictionary/dictionaryTemplates.C       |  2 +-
 src/OpenFOAM/db/error/IOerror.C               |  6 ++---
 src/OpenFOAM/db/error/error.C                 |  4 ++--
 .../interpolationLookUpTable.C                |  2 +-
 .../dummyAgglomeration/dummyAgglomeration.C   |  4 ++--
 .../procFacesGAMGProcAgglomeration.C          |  2 +-
 .../constraint/processor/processorPolyPatch.C |  4 ++--
 .../polyPatches/polyPatch/polyPatch.C         |  6 ++---
 .../functions/Function1/Ramp/Ramp.C           |  2 +-
 .../TableReader/Csv/CsvTableReader.C          |  4 ++--
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C |  8 +++----
 src/dynamicMesh/boundaryPatch/boundaryPatch.C |  4 ++--
 .../motionSmoother/motionSmootherAlgo.C       |  4 ++--
 .../general/findRefCell/findRefCell.C         |  2 +-
 .../cfdTools/general/include/alphaControls.H  |  4 ++--
 .../activeBaffleVelocityFvPatchVectorField.C  |  2 +-
 ...ureForceBaffleVelocityFvPatchVectorField.C |  2 +-
 .../solvers/MULES/CMULESTemplates.C           |  4 ++--
 .../field/fieldAverage/fieldAverage.C         |  2 +-
 .../field/streamLine/streamLine.C             |  2 +-
 src/functionObjects/forces/forces/forces.C    |  2 +-
 .../MGridGenGAMGAgglomeration.C               |  6 ++---
 .../pairPatchAgglomeration.C                  |  4 ++--
 .../solidEquilibriumEnergySource.C            |  4 ++--
 .../volumeFractionSource.C                    |  2 +-
 .../Templates/DSMCParcel/DSMCParcelI.H        |  4 ++--
 .../ParticleCollector/ParticleCollector.C     |  2 +-
 .../ParticleTracks/ParticleTracks.C           |  6 ++---
 .../FieldActivatedInjection.C                 |  4 ++--
 .../ParticleForce/ParticleForceNew.C          |  4 ++--
 .../ParticleForces/Scaled/ScaledForce.C       |  6 ++---
 .../medialAxisMeshMover.C                     |  2 +-
 .../refinementFeatures/refinementFeatures.C   |  4 ++--
 .../layerParameters/layerParameters.C         | 12 +++++-----
 .../refinementParameters.C                    | 10 ++++-----
 .../snapParameters/snapParameters.C           |  8 +++----
 .../sets/cellSources/nbrToCell/nbrToCell.C    |  4 ++--
 .../surfaceFeatures/surfaceFeatures.C         | 10 ++++-----
 .../decompositionMethod/decompositionMethod.C |  2 +-
 .../radiationModels/fvDOM/fvDOM.C             |  8 +++----
 .../kinematicSingleLayer.C                    |  4 ++--
 .../thermalBaffleFvPatchScalarField.C         |  2 +-
 .../thermalBaffle/thermalBaffle.C             |  4 ++--
 .../springRenumber/springRenumber.C           |  4 ++--
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.C |  2 +-
 .../rigidBodyMeshMotionSolver.C               |  2 +-
 .../sampledSet/arcUniform/arcUniform.C        |  8 +++----
 .../boundaryRandom/boundaryRandom.C           |  4 ++--
 .../sampledSet/circleRandom/circleRandom.C    |  6 ++---
 .../sampledSet/lineUniform/lineUniform.C      |  4 ++--
 .../sampledSet/sphereRandom/sphereRandom.C    |  4 ++--
 src/surfMesh/surfZone/surfZone/surfZone.C     |  4 ++--
 .../surfZone/surfZone/surfZoneIOList.C        |  4 ++--
 .../TDACChemistryModel/reduction/DAC/DAC.C    |  2 +-
 .../reduction/DRGEP/DRGEP.C                   |  2 +-
 .../tabulation/ISAT/binaryTree/binaryTree.C   |  4 ++--
 .../constant/constantThermophysicalFunction.C |  2 +-
 .../table/tableThermophysicalFunction.C       |  4 ++--
 .../triSurface/surfacePatch/surfacePatch.C    |  4 ++--
 .../surfacePatch/surfacePatchIOList.C         |  6 ++---
 90 files changed, 196 insertions(+), 196 deletions(-)

diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 462585bdc3..d0789e2198 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -69,7 +69,7 @@
     // Remove the swirl component of velocity for "wedge" cases
     if (pimple.dict().found("removeSwirl"))
     {
-        label swirlCmpt(readLabel(pimple.dict().lookup("removeSwirl")));
+        label swirlCmpt(pimple.dict().lookup<label>("removeSwirl"));
 
         Info<< "Removing swirl component-" << swirlCmpt << " of U" << endl;
         U.field().replace(swirlCmpt, 0.0);
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 7ae7c3f373..17ff6eb4d6 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -891,7 +891,7 @@ void Foam::multiphaseMixtureThermo::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
     scalar cAlpha(readScalar(alphaControls.lookup("cAlpha")));
 
     volScalarField& alpha = phases_.first();
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
index 759e0c22b6..852ffd63d9 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
@@ -1,8 +1,8 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
 
 bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
index a99a0b39e2..ebab6a2fcd 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
@@ -1,5 +1,5 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
index 2b42206226..cc9d99e5e7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
@@ -1,8 +1,8 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
 
 bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index a594c25b39..c5eb535e29 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -821,7 +821,7 @@ void Foam::multiphaseSystem::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
 
     if (nAlphaSubCycles > 1)
     {
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index e3af4aebc0..397695093c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -308,7 +308,7 @@ void Foam::multiphaseMixture::solve()
     volScalarField& alpha = phases_.first();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
     scalar cAlpha(readScalar(alphaControls.lookup("cAlpha")));
 
     if (nAlphaSubCycles > 1)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
index 5ebddd3534..8db8083288 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
@@ -27,7 +27,7 @@ License
 
 inline Foam::label Foam::diameterModels::populationBalanceModel::nCorr() const
 {
-    return mesh_.solverDict(name_).lookupType<label>("nCorr");
+    return mesh_.solverDict(name_).lookup<label>("nCorr");
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 4a9be34270..66754f19b4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -663,7 +663,7 @@ void Foam::multiphaseSystem::solve
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
 
     bool LTS = fv::localEulerDdt::enabled(mesh_);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 9da3a82126..e70fd619a0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -129,8 +129,8 @@ void Foam::twoPhaseSystem::solve
 
     const dictionary& alphaControls = mesh_.solverDict(alpha1.name());
 
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
     bool LTS = fv::localEulerDdt::enabled(mesh_);
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
index db77d94af4..815d207446 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
@@ -1,3 +1,3 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 9d711083ab..2c0b317fce 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -361,8 +361,8 @@ void Foam::twoPhaseSystem::solve()
         alpha1.name()
     );
 
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
     word alphaScheme("div(phi," + alpha1.name() + ')');
     word alpharScheme("div(phir," + alpha1.name() + ')');
diff --git a/applications/test/Function1/Test-Function1.C b/applications/test/Function1/Test-Function1.C
index 5c8837d71d..646e0f95eb 100644
--- a/applications/test/Function1/Test-Function1.C
+++ b/applications/test/Function1/Test-Function1.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
     const scalar x0 = readScalar(dict.lookup("x0"));
     const scalar x1 = readScalar(dict.lookup("x1"));
-    const label nX = readLabel(dict.lookup("nX"));
+    const label nX = dict.lookup<label>("nX");
     const scalar dx = (x1 - x0)/(nX - 1);
     const scalarField xs
     (
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index af27af63a6..d78c48a983 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -681,8 +681,8 @@ int main(int argc, char *argv[])
 
     fileName surfName(refineDict.lookup("surface"));
     surfName.expand();
-    label nCutLayers(readLabel(refineDict.lookup("nCutLayers")));
-    label cellLimit(readLabel(refineDict.lookup("cellLimit")));
+    label nCutLayers(refineDict.lookup<label>("nCutLayers"));
+    label cellLimit(refineDict.lookup<label>("cellLimit"));
     bool selectCut(readBool(refineDict.lookup("selectCut")));
     bool selectInside(readBool(refineDict.lookup("selectInside")));
     bool selectOutside(readBool(refineDict.lookup("selectOutside")));
@@ -693,7 +693,7 @@ int main(int argc, char *argv[])
     scalar curvature(readScalar(refineDict.lookup("curvature")));
     scalar curvDist(readScalar(refineDict.lookup("curvatureDistance")));
     pointField outsidePts(refineDict.lookup("outsidePoints"));
-    label refinementLimit(readLabel(refineDict.lookup("splitLevel")));
+    label refinementLimit(refineDict.lookup<label>("splitLevel"));
     bool writeMesh(readBool(refineDict.lookup("writeMesh")));
 
     Info<< "Cells to be used for meshing (0=false, 1=true):" << nl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C
index 8bc216e6ed..56da4af1e2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C
@@ -73,7 +73,7 @@ Foam::cv2DControls::cv2DControls
 
     maxBoundaryConformingIter_
     (
-        readLabel(conformationControl_.lookup("maxBoundaryConformingIter"))
+        conformationControl_.lookup<label>("maxBoundaryConformingIter")
     ),
 
     span_
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 043d9c9181..952223a66b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -819,8 +819,8 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
     (
         coeffsDict.lookupOrDefault<scalar>("minCellSizeLimit", 0.0)
     ),
-    minLevels_(readLabel(coeffsDict.lookup("minLevels"))),
-    volRes_(readLabel(coeffsDict.lookup("sampleResolution"))),
+    minLevels_(coeffsDict.lookup<label>("minLevels")),
+    volRes_(coeffsDict.lookup<label>("sampleResolution")),
     maxCellWeightCoeff_(readScalar(coeffsDict.lookup("maxCellWeightCoeff")))
 {
     if (!Pstream::parRun())
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
index e508480c45..a5de19883d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::fileControl::fileControl
     pointsFile_(controlFunctionDict.lookup("pointsFile")),
     sizesFile_(controlFunctionDict.lookup("sizesFile")),
     alignmentsFile_(controlFunctionDict.lookup("alignmentsFile")),
-    maxPriority_(readLabel(controlFunctionDict.lookup("priority")))
+    maxPriority_(controlFunctionDict.lookup<label>("priority"))
 {
     Info<< indent << "Loading " << name << " from file:" << nl
         << indent << "    priority   : " << maxPriority_ << nl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 0d3bbce51f..fc33e29023 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Foam::cellSizeFunction::cellSizeFunction
     defaultCellSize_(defaultCellSize),
     regionIndices_(regionIndices),
     sideMode_(),
-    priority_(readLabel(cellSizeFunctionDict.lookup("priority", true)))
+    priority_(cellSizeFunctionDict.lookup<label>("priority", true))
 {
     word mode = cellSizeFunctionDict.lookup("mode", true);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index a46302397c..a72e6b266f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -754,7 +754,7 @@ Foam::conformalVoronoiMesh::createPolyMeshFromPoints
 
     forAll(patches, p)
     {
-        label totalPatchSize = readLabel(patchDicts[p].lookup("nFaces"));
+        label totalPatchSize = patchDicts[p].lookup<label>("nFaces");
 
         if
         (
@@ -1741,7 +1741,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
             procNeighbours[patchi] =
             (
                 patchDicts[patchi].found("neighbProcNo")
-              ? readLabel(patchDicts[patchi].lookup("neighbProcNo"))
+              ? patchDicts[patchi].lookup<label>("neighbProcNo")
               : -1
             );
         }
@@ -2368,7 +2368,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                 const label neighbour =
                 (
                     patchDicts[nbI].found("neighbProcNo")
-                  ? readLabel(patchDicts[nbI].lookup("neighbProcNo"))
+                  ? patchDicts[nbI].lookup<label>("neighbProcNo")
                   : -1
                 );
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index f76be9a7bc..e5928a6421 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -155,7 +155,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
         forAll(dualPatchStarts, patchi)
         {
             dualPatchStarts[patchi] =
-                readLabel(patchDicts[patchi].lookup("startFace"));
+                patchDicts[patchi].lookup<label>("startFace");
         }
     }
 
@@ -436,8 +436,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
                 0,          // patchStarts[p],
                 patchi,
                 mesh.boundaryMesh(),
-                readLabel(patchDicts[patchi].lookup("myProcNo")),
-                readLabel(patchDicts[patchi].lookup("neighbProcNo")),
+                patchDicts[patchi].lookup<label>("myProcNo"),
+                patchDicts[patchi].lookup<label>("neighbProcNo"),
                 coupledPolyPatch::COINCIDENTFULLMATCH
             );
         }
@@ -485,10 +485,10 @@ void Foam::conformalVoronoiMesh::checkProcessorPatchesMatch
         )
         {
             const label procNeighb =
-                readLabel(patchDicts[patchi].lookup("neighbProcNo"));
+                patchDicts[patchi].lookup<label>("neighbProcNo");
 
             procPatchSizes[Pstream::myProcNo()][procNeighb]
-                = readLabel(patchDicts[patchi].lookup("nFaces"));
+                = patchDicts[patchi].lookup<label>("nFaces");
         }
     }
 
@@ -643,8 +643,8 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
                     SubList<face>
                     (
                         faces,
-                        readLabel(patchDicts[patchi].lookup("nFaces")),
-                        readLabel(patchDicts[patchi].lookup("startFace"))
+                        patchDicts[patchi].lookup<label>("nFaces"),
+                        patchDicts[patchi].lookup<label>("startFace")
                     ),
                     points
                 )
@@ -666,9 +666,9 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
         if (isA<processorPolyPatch>(pp))
         {
             const label nPatchFaces =
-                readLabel(patchDicts[patchi].lookup("nFaces"));
+                patchDicts[patchi].lookup<label>("nFaces");
             const label patchStartFace =
-                readLabel(patchDicts[patchi].lookup("startFace"));
+                patchDicts[patchi].lookup<label>("startFace");
 
             labelList patchFaceMap(nPatchFaces, label(-1));
             labelList patchFaceRotation(nPatchFaces, label(0));
@@ -783,7 +783,7 @@ void Foam::conformalVoronoiMesh::writeMesh
         );
     }
 
-    const label nInternalFaces = readLabel(patchDicts[0].lookup("startFace"));
+    const label nInternalFaces = patchDicts[0].lookup<label>("startFace");
 
     reorderPoints(points, boundaryPts, faces, nInternalFaces);
 
@@ -831,7 +831,7 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     forAll(patches, p)
     {
-        label totalPatchSize = readLabel(patchDicts[p].lookup("nFaces"));
+        label totalPatchSize = patchDicts[p].lookup<label>("nFaces");
 
         if
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C
index 15a2672829..c80e758d82 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ Foam::cvControls::cvControls
     surfaceConformationRebuildFrequency_ = max
     (
         1,
-        readLabel(surfDict.lookup("surfaceConformationRebuildFrequency"))
+        surfDict.lookup<label>("surfaceConformationRebuildFrequency")
     );
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index c87df18f21..45ffa989e1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -884,9 +884,9 @@ autoDensity::autoDensity
     (
         detailsDict().lookupOrDefault<scalar>("minCellSizeLimit", 0.0)
     ),
-    minLevels_(readLabel(detailsDict().lookup("minLevels"))),
+    minLevels_(detailsDict().lookup<label>("minLevels")),
     maxSizeRatio_(readScalar(detailsDict().lookup("maxSizeRatio"))),
-    volRes_(readLabel(detailsDict().lookup("sampleResolution"))),
+    volRes_(detailsDict().lookup<label>("sampleResolution")),
     surfRes_
     (
         detailsDict().lookupOrDefault<label>("surfaceSampleResolution", volRes_)
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index b1f9858332..502bba0008 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -432,7 +432,7 @@ int main(int argc, char *argv[])
         // Get requested numberOfSubdomains. Note: have no mesh yet so
         // cannot use decompositionModel::New
         const label nDomains =
-            readLabel(IOdictionary(dictIO).lookup("numberOfSubdomains"));
+            IOdictionary(dictIO).lookup<label>("numberOfSubdomains");
 
         // Give file handler a chance to determine the output directory
         const_cast<fileOperation&>(fileHandler()).setNProcs(nDomains);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 2a157fc6d3..c666359ad5 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -352,7 +352,7 @@ void Foam::vtkPVFoam::updateInfoPatches
             {
                 const dictionary& patchDict = patchEntries[patchi].dict();
 
-                sizes[patchi] = readLabel(patchDict.lookup("nFaces"));
+                sizes[patchi] = patchDict.lookup<label>("nFaces");
                 names[patchi] = patchEntries[patchi].keyword();
             }
 
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 78738e321d..8a9b6e8dac 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -11,8 +11,8 @@ IOdictionary propsDict
 
 const word cloudName(propsDict.lookup("cloudName"));
 
-label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
+label sampleFrequency(propsDict.lookup<label>("sampleFrequency"));
 
-label maxPositions(readLabel(propsDict.lookup("maxPositions")));
+label maxPositions(propsDict.lookup<label>("maxPositions"));
 
 word setFormat(propsDict.lookupOrDefault<word>("setFormat", "vtk"));
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index 2a50a2b9e5..db55619910 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -10,9 +10,9 @@
         )
     );
 
-    const label nIntervals(readLabel(pdfDictionary.lookup("nIntervals")));
+    const label nIntervals(pdfDictionary.lookup<label>("nIntervals"));
 
-    const label nSamples(readLabel(pdfDictionary.lookup("nSamples")));
+    const label nSamples(pdfDictionary.lookup<label>("nSamples"));
 
     const bool writeData(readBool(pdfDictionary.lookup("writeData")));
 
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index 9587ea098e..9426383baf 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -210,16 +210,16 @@ void rewriteBoundary
                 Info<< "Replaced with patches" << nl
                     << patches[patchi].keyword() << " with" << nl
                     << "    nFaces    : "
-                    << readLabel(thisPatchDict.lookup("nFaces"))
+                    << thisPatchDict.lookup<label>("nFaces")
                     << nl
                     << "    startFace : "
-                    << readLabel(thisPatchDict.lookup("startFace")) << nl
+                    << thisPatchDict.lookup<label>("startFace") << nl
                     << patches[addedPatchi].keyword() << " with" << nl
                     << "    nFaces    : "
-                    << readLabel(nbrPatchDict.lookup("nFaces"))
+                    << nbrPatchDict.lookup<label>("nFaces")
                     << nl
                     << "    startFace : "
-                    << readLabel(nbrPatchDict.lookup("startFace"))
+                    << nbrPatchDict.lookup<label>("startFace")
                     << nl << endl;
 
                 addedPatchi++;
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index a50b4df6a3..f8487d4e1d 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
             )
         );
 
-        int nProcs(readInt(decompositionDict.lookup("numberOfSubdomains")));
+        const int nProcs(decompositionDict.lookup<int>("numberOfSubdomains"));
 
         Info<< "Create target mesh\n" << endl;
 
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
             )
         );
 
-        int nProcs(readInt(decompositionDict.lookup("numberOfSubdomains")));
+        const int nProcs(decompositionDict.lookup<int>("numberOfSubdomains"));
 
         Info<< "Create source mesh\n" << endl;
 
@@ -490,9 +490,9 @@ int main(int argc, char *argv[])
             )
         );
 
-        int nProcsSource
+        const int nProcsSource
         (
-            readInt(decompositionDictSource.lookup("numberOfSubdomains"))
+            decompositionDictSource.lookup<int>("numberOfSubdomains")
         );
 
 
@@ -508,9 +508,9 @@ int main(int argc, char *argv[])
             )
         );
 
-        int nProcsTarget
+        const int nProcsTarget
         (
-            readInt(decompositionDictTarget.lookup("numberOfSubdomains"))
+            decompositionDictTarget.lookup<int>("numberOfSubdomains")
         );
 
         List<boundBox> bbsTarget(nProcsTarget);
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
index 85c6a64f39..1b187abdeb 100644
--- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
@@ -52,7 +52,7 @@ Foam::functionObjects::FUNCTIONOBJECT::FUNCTIONOBJECT
     fvMeshFunctionObject(name, runTime, dict),
     wordData_(dict.lookupOrDefault<word>("wordData", "defaultWord")),
     scalarData_(readScalar(dict.lookup("scalarData"))),
-    labelData_(readLabel(dict.lookup("labelData")))
+    labelData_(dict.lookup<label>("labelData"))
 {
     read(dict);
 }
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 2ef614961a..32f2a9676c 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -380,7 +380,7 @@ public:
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
             template<class T>
-            T lookupType
+            T lookup
             (
                 const word&,
                 bool recursive=false,
diff --git a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
index 219333f693..775d0a79fd 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-T Foam::dictionary::lookupType
+T Foam::dictionary::lookup
 (
     const word& keyword,
     bool recursive,
diff --git a/src/OpenFOAM/db/error/IOerror.C b/src/OpenFOAM/db/error/IOerror.C
index e09a5720c1..82274a0a6c 100644
--- a/src/OpenFOAM/db/error/IOerror.C
+++ b/src/OpenFOAM/db/error/IOerror.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,8 +45,8 @@ Foam::IOerror::IOerror(const dictionary& errDict)
 :
     error(errDict),
     ioFileName_(errDict.lookup("ioFileName")),
-    ioStartLineNumber_(readLabel(errDict.lookup("ioStartLineNumber"))),
-    ioEndLineNumber_(readLabel(errDict.lookup("ioEndLineNumber")))
+    ioStartLineNumber_(errDict.lookup<label>("ioStartLineNumber")),
+    ioEndLineNumber_(errDict.lookup<label>("ioEndLineNumber"))
 {}
 
 
diff --git a/src/OpenFOAM/db/error/error.C b/src/OpenFOAM/db/error/error.C
index 17a6d45f32..4efbe987a6 100644
--- a/src/OpenFOAM/db/error/error.C
+++ b/src/OpenFOAM/db/error/error.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ Foam::error::error(const dictionary& errDict)
     messageStream(errDict),
     functionName_(errDict.lookup("functionName")),
     sourceFileName_(errDict.lookup("sourceFileName")),
-    sourceFileLineNumber_(readLabel(errDict.lookup("sourceFileLineNumber"))),
+    sourceFileLineNumber_(errDict.lookup<label>("sourceFileLineNumber")),
     abort_(env("FOAM_ABORT")),
     throwExceptions_(false),
     messageStreamPtr_(new OStringStream())
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index c7ef00861d..d150de5b38 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -158,7 +158,7 @@ void Foam::interpolationLookUpTable<Type>::dimensionTable()
 
     forAll(entries_,i)
     {
-        dim_[i] = readLabel(entries_[i].lookup("N"));
+        dim_[i] = entries_[i].template lookup<label>("N");
         max_[i] = readScalar(entries_[i].lookup("max"));
         min_[i] = readScalar(entries_[i].lookup("min"));
         delta_[i] = (max_[i] - min_[i])/dim_[i];
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
index 7feea67efa..f5b14b34bb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::dummyAgglomeration::dummyAgglomeration
 )
 :
     GAMGAgglomeration(mesh, controlDict),
-    nLevels_(readLabel(controlDict.lookup("nLevels")))
+    nLevels_(controlDict.lookup<label>("nLevels"))
 {
     const label nCoarseCells = mesh.lduAddr().size();
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index b0ada9c3e1..2281127088 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -223,7 +223,7 @@ Foam::procFacesGAMGProcAgglomeration::procFacesGAMGProcAgglomeration
 )
 :
     GAMGProcAgglomeration(agglom, controlDict),
-    nAgglomeratingCells_(readLabel(controlDict.lookup("nAgglomeratingCells")))
+    nAgglomeratingCells_(controlDict.lookup<label>("nAgglomeratingCells"))
 {}
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index d8fce4caef..ca03d3ff62 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -109,8 +109,8 @@ Foam::processorPolyPatch::processorPolyPatch
 )
 :
     coupledPolyPatch(name, dict, index, bm, patchType),
-    myProcNo_(readLabel(dict.lookup("myProcNo"))),
-    neighbProcNo_(readLabel(dict.lookup("neighbProcNo"))),
+    myProcNo_(dict.lookup<label>("myProcNo")),
+    neighbProcNo_(dict.lookup<label>("neighbProcNo")),
     neighbFaceCentres_(),
     neighbFaceAreas_(),
     neighbFaceCellCentres_()
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index a7e388afc5..1e519a8d17 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -122,12 +122,12 @@ Foam::polyPatch::polyPatch
         faceSubList
         (
             bm.mesh().faces(),
-            readLabel(dict.lookup("nFaces")),
-            readLabel(dict.lookup("startFace"))
+            dict.lookup<label>("nFaces"),
+            dict.lookup<label>("startFace")
         ),
         bm.mesh().points()
     ),
-    start_(readLabel(dict.lookup("startFace"))),
+    start_(dict.lookup<label>("startFace")),
     boundaryMesh_(bm),
     faceCellsPtr_(nullptr),
     mePtr_(nullptr)
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
index fe929706d8..13fc5ce055 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
@@ -31,7 +31,7 @@ template <class Function1Type>
 void Foam::Function1s::Ramp<Function1Type>::read(const dictionary& coeffs)
 {
     start_ = coeffs.lookupOrDefault<scalar>("start", 0);
-    duration_ = coeffs.lookupType<scalar>("duration");
+    duration_ = coeffs.lookup<scalar>("duration");
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C
index 144687ceec..56bf01aa09 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C
@@ -215,8 +215,8 @@ template<class Type>
 Foam::TableReaders::Csv<Type>::Csv(const dictionary& dict)
 :
     TableReader<Type>(dict),
-    nHeaderLine_(readLabel(dict.lookup("nHeaderLine"))),
-    refColumn_(readLabel(dict.lookup("refColumn"))),
+    nHeaderLine_(dict.lookup<label>("nHeaderLine")),
+    refColumn_(dict.lookup<label>("refColumn")),
     componentColumns_(dict.lookup("componentColumns")),
     separator_(dict.lookupOrDefault<string>("separator", string(","))[0]),
     mergeSeparators_(readBool(dict.lookup("mergeSeparators")))
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 03bee363b9..8b8ee914e5 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -1183,7 +1183,7 @@ bool Foam::dynamicRefineFvMesh::update()
         dynamicMeshDict().optionalSubDict(typeName + "Coeffs")
     );
 
-    label refineInterval = readLabel(refineDict.lookup("refineInterval"));
+    label refineInterval = refineDict.lookup<label>("refineInterval");
 
     bool hasChanged = false;
 
@@ -1207,7 +1207,7 @@ bool Foam::dynamicRefineFvMesh::update()
 
     if (time().timeIndex() > 0 && time().timeIndex() % refineInterval == 0)
     {
-        label maxCells = readLabel(refineDict.lookup("maxCells"));
+        label maxCells = refineDict.lookup<label>("maxCells");
 
         if (maxCells <= 0)
         {
@@ -1218,7 +1218,7 @@ bool Foam::dynamicRefineFvMesh::update()
                 << exit(FatalError);
         }
 
-        label maxRefinement = readLabel(refineDict.lookup("maxRefinement"));
+        label maxRefinement = refineDict.lookup<label>("maxRefinement");
 
         if (maxRefinement <= 0)
         {
@@ -1243,7 +1243,7 @@ bool Foam::dynamicRefineFvMesh::update()
             great
         );
         const label nBufferLayers =
-            readLabel(refineDict.lookup("nBufferLayers"));
+            refineDict.lookup<label>("nBufferLayers");
 
         // Cells marked for refinement or otherwise protected from unrefinement.
         PackedBoolList refineCell(nCells());
diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.C b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
index 413e9284b9..7a95664a53 100644
--- a/src/dynamicMesh/boundaryPatch/boundaryPatch.C
+++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
@@ -52,8 +52,8 @@ Foam::boundaryPatch::boundaryPatch
 )
 :
     patchIdentifier(name, dict, index),
-    size_(readLabel(dict.lookup("nFaces"))),
-    start_(readLabel(dict.lookup("startFace")))
+    size_(dict.lookup<label>("nFaces")),
+    start_(dict.lookup<label>("startFace"))
 {}
 
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index 9107f71071..8cd1bb8025 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -872,7 +872,7 @@ bool Foam::motionSmootherAlgo::scaleMesh
     const scalar errorReduction =
         readScalar(paramDict.lookup("errorReduction"));
     const label nSmoothScale =
-        readLabel(paramDict.lookup("nSmoothScale"));
+        paramDict.lookup<label>("nSmoothScale");
 
 
     // Note: displacement_ should already be synced already from setDisplacement
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index fae9bc2f02..811ad88b1a 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -48,7 +48,7 @@ bool Foam::setRefCell
         {
             if (Pstream::master())
             {
-                refCelli = readLabel(dict.lookup(refCellName));
+                refCelli = dict.lookup<label>(refCellName);
 
                 if (refCelli < 0 || refCelli >= field.mesh().nCells())
                 {
diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H
index 2f1b50a785..17d80a1a3f 100644
--- a/src/finiteVolume/cfdTools/general/include/alphaControls.H
+++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H
@@ -1,8 +1,8 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
 
 bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 5d520179a8..f1765a347e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -89,7 +89,7 @@ activeBaffleVelocityFvPatchVectorField
     pName_(dict.lookupOrDefault<word>("p", "p")),
     cyclicPatchName_(dict.lookup("cyclicPatch")),
     cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
-    orientation_(readLabel(dict.lookup("orientation"))),
+    orientation_(dict.lookup<label>("orientation")),
     initWallSf_(p.Sf()),
     initCyclicSf_(p.boundaryMesh()[cyclicPatchLabel_].Sf()),
     nbrCyclicSf_
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 2d58111ebd..4e3c901eb2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -95,7 +95,7 @@ activePressureForceBaffleVelocityFvPatchVectorField
     pName_(dict.lookupOrDefault<word>("p", "p")),
     cyclicPatchName_(dict.lookup("cyclicPatch")),
     cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
-    orientation_(readLabel(dict.lookup("orientation"))),
+    orientation_(dict.lookup<label>("orientation")),
     initWallSf_(0),
     initCyclicSf_(0),
     nbrCyclicSf_(0),
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index f43e43e43c..57c3529614 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -220,7 +220,7 @@ void Foam::MULES::limiterCorr
 
     const label nLimiterIter
     (
-        readLabel(MULEScontrols.lookup("nLimiterIter"))
+        MULEScontrols.lookup<label>("nLimiterIter")
     );
 
     const scalar smoothLimiter
diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C
index 2cb1c45041..2903a01382 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverage.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverage.C
@@ -265,7 +265,7 @@ void Foam::functionObjects::fieldAverage::readAveragingProperties()
             {
                 dictionary fieldDict(propsDict.subDict(fieldName));
 
-                totalIter_[fieldi] = readLabel(fieldDict.lookup("totalIter"));
+                totalIter_[fieldi] = fieldDict.lookup<label>("totalIter");
                 totalTime_[fieldi] = readScalar(fieldDict.lookup("totalTime"));
 
                 Log << "        " << fieldName
diff --git a/src/functionObjects/field/streamLine/streamLine.C b/src/functionObjects/field/streamLine/streamLine.C
index 4b384840c1..c55b9289b1 100644
--- a/src/functionObjects/field/streamLine/streamLine.C
+++ b/src/functionObjects/field/streamLine/streamLine.C
@@ -346,7 +346,7 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
     if (!dict.found("direction") && dict.found("trackForward"))
     {
         trackDirection_ =
-            dict.lookupType<bool>("trackForward")
+            dict.lookup<bool>("trackForward")
           ? trackDirection::forward
           : trackDirection::backward;
     }
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 8d6a656339..b8cb5218d6 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -60,7 +60,7 @@ Foam::wordList Foam::functionObjects::forces::createFileNames
     if (dict.found("binData"))
     {
         const dictionary& binDict(dict.subDict("binData"));
-        label nb = readLabel(binDict.lookup("nBin"));
+        label nb = binDict.lookup<label>("nBin");
         if (nb > 0)
         {
             // Name for file(fileID::binsFile=1)
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
index 8865bf70fc..6b07886c58 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
@@ -170,14 +170,14 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
     fvMesh_(refCast<const fvMesh>(mesh))
 {
     // Min, max size of agglomerated cells
-    label minSize(readLabel(controlDict.lookup("minSize")));
-    label maxSize(readLabel(controlDict.lookup("maxSize")));
+    label minSize(controlDict.lookup<label>("minSize"));
+    label maxSize(controlDict.lookup<label>("maxSize"));
 
     // Number of iterations applied to improve agglomeration consistency across
     // processor boundaries
     label nProcConsistencyIter
     (
-        readLabel(controlDict.lookup("nProcConsistencyIter"))
+        controlDict.lookup<label>("nProcConsistencyIter")
     );
 
     // Start geometric agglomeration from the cell volumes and areas of the mesh
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index 83a628d73f..4b3301f7f7 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -200,7 +200,7 @@ Foam::pairPatchAgglomeration::pairPatchAgglomeration
     maxLevels_(50),
     nFacesInCoarsestLevel_
     (
-        readLabel(controlDict.lookup("nFacesInCoarsestLevel"))
+        controlDict.lookup<label>("nFacesInCoarsestLevel")
     ),
     featureAngle_
     (
diff --git a/src/fvOptions/sources/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C b/src/fvOptions/sources/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
index 06931d6aaf..e5f8ee3c53 100644
--- a/src/fvOptions/sources/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
+++ b/src/fvOptions/sources/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
@@ -102,7 +102,7 @@ Foam::fv::solidEquilibriumEnergySource::solidEquilibriumEnergySource
 )
 :
     option(name, modelType, dict, mesh),
-    phaseName_(dict.lookupType<word>("phase"))
+    phaseName_(dict.lookup<word>("phase"))
 {
     read(dict);
     alpha();
@@ -169,7 +169,7 @@ bool Foam::fv::solidEquilibriumEnergySource::read(const dictionary& dict)
 {
     if (option::read(dict))
     {
-        fieldNames_ = wordList(1, coeffs_.lookupType<word>("field"));
+        fieldNames_ = wordList(1, coeffs_.lookup<word>("field"));
 
         applied_.setSize(fieldNames_.size(), false);
 
diff --git a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C
index c35c18b0cc..07406836f0 100644
--- a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C
+++ b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C
@@ -199,7 +199,7 @@ Foam::fv::volumeFractionSource::volumeFractionSource
 )
 :
     option(name, modelType, dict, mesh),
-    phaseName_(dict.lookupType<word>("phase")),
+    phaseName_(dict.lookup<word>("phase")),
     phiName_("phi"),
     rhoName_("rho"),
     UName_("U")
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
index 1b09d95b17..b4cca7869f 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ inline Foam::DSMCParcel<ParcelType>::constantProperties::constantProperties
     d_(readScalar(dict.lookup("diameter"))),
     internalDegreesOfFreedom_
     (
-        readInt(dict.lookup("internalDegreesOfFreedom"))
+        dict.template lookup<int>("internalDegreesOfFreedom")
     ),
     omega_(readScalar(dict.lookup("omega")))
 {}
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index e4b4f54867..0c28668c76 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -158,7 +158,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
     vector origin(this->coeffDict().lookup("origin"));
 
     this->coeffDict().lookup("radius") >> radius_;
-    nSector_ = readLabel(this->coeffDict().lookup("nSector"));
+    nSector_ = this->coeffDict().template lookup<label>("nSector");
 
     label nS = nSector_;
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index 3a6928a1f6..6d0bd50ea4 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,8 +63,8 @@ Foam::ParticleTracks<CloudType>::ParticleTracks
 )
 :
     CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
-    trackInterval_(readLabel(this->coeffDict().lookup("trackInterval"))),
-    maxSamples_(readLabel(this->coeffDict().lookup("maxSamples"))),
+    trackInterval_(this->coeffDict().template lookup<label>("trackInterval")),
+    maxSamples_(this->coeffDict().template lookup<label>("maxSamples")),
     resetOnWrite_(this->coeffDict().lookup("resetOnWrite")),
     faceHitCounter_(),
     cloudPtr_(nullptr)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 386788ed79..b1a8fcad2f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
     injectorTetPts_(positions_.size()),
     nParcelsPerInjector_
     (
-        readLabel(this->coeffDict().lookup("parcelsPerInjector"))
+        this->coeffDict().template lookup<label>("parcelsPerInjector")
     ),
     nParcelsInjected_(positions_.size(), 0),
     U0_(this->coeffDict().lookup("U0")),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
index 754fe26f78..7d4ddfebab 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::ParticleForce<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end() && dict.found("type"))
     {
-        forceType = dict.lookupType<word>("type");
+        forceType = dict.lookup<word>("type");
         cstrIter = dictionaryConstructorTablePtr_->find(forceType);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Scaled/ScaledForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Scaled/ScaledForce.C
index d25798742c..ee5b8f56b4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Scaled/ScaledForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Scaled/ScaledForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::dictionary Foam::ScaledForce<CloudType>::modelDict
 ) const
 {
     dictionary modelDict(dict);
-    modelDict.add<word>("type", dict.lookupType<word>("forceType"), true);
+    modelDict.add<word>("type", dict.lookup<word>("forceType"), true);
     return modelDict;
 }
 
@@ -58,7 +58,7 @@ Foam::ScaledForce<CloudType>::ScaledForce
             owner,
             mesh,
             modelDict(dict),
-            dict.lookupType<word>("forceType")
+            dict.lookup<word>("forceType")
         )
     ),
     factor_(readScalar(this->coeffs().lookup("factor")))
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 711b5c5f91..92709023ad 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -2048,7 +2048,7 @@ bool Foam::medialAxisMeshMover::shrinkMesh
 )
 {
     //- Number of attempts shrinking the mesh
-    const label nSnap  = readLabel(meshQualityDict.lookup("nRelaxIter"));
+    const label nSnap  = meshQualityDict.lookup<label>("nRelaxIter");
 
 
 
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 8a58cdf9c6..b657eb67f6 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -227,7 +227,7 @@ void Foam::refinementFeatures::read
         else
         {
             // Look up 'level' for single level
-            levels_[featI] = labelList(1, readLabel(dict.lookup("level")));
+            levels_[featI] = labelList(1, dict.lookup<label>("level"));
             distances_[featI] = scalarField(1, 0.0);
         }
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
index b8a16d630e..b25f701305 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
@@ -119,7 +119,7 @@ Foam::layerParameters::layerParameters
         boundaryMesh.size(),
         dict.found("mergeFaces")
       ? (
-            dict.lookupType<bool>("mergeFaces")
+            dict.lookup<bool>("mergeFaces")
           ? mergeFace::yes
           : mergeFace::no
         )
@@ -130,16 +130,16 @@ Foam::layerParameters::layerParameters
     (
         dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
     ),
-    nGrow_(readLabel(dict.lookup("nGrow"))),
+    nGrow_(dict.lookup<label>("nGrow")),
     maxFaceThicknessRatio_
     (
         readScalar(dict.lookup("maxFaceThicknessRatio"))
     ),
     nBufferCellsNoExtrude_
     (
-        readLabel(dict.lookup("nBufferCellsNoExtrude"))
+        dict.lookup<label>("nBufferCellsNoExtrude")
     ),
-    nLayerIter_(readLabel(dict.lookup("nLayerIter"))),
+    nLayerIter_(dict.lookup<label>("nLayerIter")),
     nRelaxedIter_(labelMax),
     additionalReporting_(dict.lookupOrDefault("additionalReporting", false)),
     meshShrinker_
@@ -290,7 +290,7 @@ Foam::layerParameters::layerParameters
                     const label patchi = patchiter.key();
 
                     numLayers_[patchi] =
-                        readLabel(layerDict.lookup("nSurfaceLayers"));
+                        layerDict.lookup<label>("nSurfaceLayers");
 
                     switch (layerSpec_)
                     {
@@ -376,7 +376,7 @@ Foam::layerParameters::layerParameters
                     if (layerDict.found("mergeFaces"))
                     {
                         mergeFaces_[patchi] =
-                            layerDict.lookupType<bool>("mergeFaces")
+                            layerDict.lookup<bool>("mergeFaces")
                           ? mergeFace::yes
                           : mergeFace::no;
                     }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
index 97d21ccbde..2eac9e3f6b 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,9 +32,9 @@ License
 
 Foam::refinementParameters::refinementParameters(const dictionary& dict)
 :
-    maxGlobalCells_(readLabel(dict.lookup("maxGlobalCells"))),
-    maxLocalCells_(readLabel(dict.lookup("maxLocalCells"))),
-    minRefineCells_(readLabel(dict.lookup("minRefinementCells"))),
+    maxGlobalCells_(dict.lookup<label>("maxGlobalCells")),
+    maxLocalCells_(dict.lookup<label>("maxLocalCells")),
+    minRefineCells_(dict.lookup<label>("minRefinementCells")),
     planarAngle_
     (
         dict.lookupOrDefault
@@ -43,7 +43,7 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
             readScalar(dict.lookup("resolveFeatureAngle"))
         )
     ),
-    nBufferLayers_(readLabel(dict.lookup("nCellsBetweenLevels"))),
+    nBufferLayers_(dict.lookup<label>("nCellsBetweenLevels")),
     keepPoints_(pointField(1, dict.lookup("locationInMesh"))),
     allowFreeStandingZoneFaces_(dict.lookup("allowFreeStandingZoneFaces")),
     useTopologicalSnapDetection_
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
index 2e618327bc..3541cde97f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,10 +30,10 @@ License
 // Construct from dictionary
 Foam::snapParameters::snapParameters(const dictionary& dict)
 :
-    nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
+    nSmoothPatch_(dict.lookup<label>("nSmoothPatch")),
     snapTol_(readScalar(dict.lookup("tolerance"))),
-    nSmoothDispl_(readLabel(dict.lookup("nSolveIter"))),
-    nSnap_(readLabel(dict.lookup("nRelaxIter"))),
+    nSmoothDispl_(dict.lookup<label>("nSolveIter")),
+    nSnap_(dict.lookup<label>("nRelaxIter")),
     nFeatureSnap_(dict.lookupOrDefault("nFeatureSnapIter", -1)),
     explicitFeatureSnap_(dict.lookupOrDefault("explicitFeatureSnap", true)),
     implicitFeatureSnap_(dict.lookupOrDefault("implicitFeatureSnap", false)),
diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C
index 83efec81e9..dd3c748436 100644
--- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C
+++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ Foam::nbrToCell::nbrToCell
 )
 :
     topoSetSource(mesh),
-    minNbrs_(readLabel(dict.lookup("neighbours")))
+    minNbrs_(dict.lookup<label>("neighbours"))
 {}
 
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index d4a0e3b737..72b791fcad 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -506,8 +506,8 @@ Foam::surfaceFeatures::surfaceFeatures
     surf_(surf),
     featurePoints_(featInfoDict.lookup("featurePoints")),
     featureEdges_(featInfoDict.lookup("featureEdges")),
-    externalStart_(readLabel(featInfoDict.lookup("externalStart"))),
-    internalStart_(readLabel(featInfoDict.lookup("internalStart")))
+    externalStart_(featInfoDict.lookup<label>("externalStart")),
+    internalStart_(featInfoDict.lookup<label>("internalStart"))
 {}
 
 
@@ -529,8 +529,8 @@ Foam::surfaceFeatures::surfaceFeatures
 
     featureEdges_ = labelList(featInfoDict.lookup("featureEdges"));
     featurePoints_ = labelList(featInfoDict.lookup("featurePoints"));
-    externalStart_ = readLabel(featInfoDict.lookup("externalStart"));
-    internalStart_ = readLabel(featInfoDict.lookup("internalStart"));
+    externalStart_ = featInfoDict.lookup<label>("externalStart");
+    internalStart_ = featInfoDict.lookup<label>("internalStart");
 }
 
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index a523f7cb49..c39078a8dc 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -59,7 +59,7 @@ Foam::decompositionMethod::decompositionMethod
     decompositionDict_(decompositionDict),
     nProcessors_
     (
-        readLabel(decompositionDict.lookup("numberOfSubdomains"))
+        decompositionDict.lookup<label>("numberOfSubdomains")
     )
 {
     // Read any constraints
diff --git a/src/radiationModels/radiationModels/fvDOM/fvDOM.C b/src/radiationModels/radiationModels/fvDOM/fvDOM.C
index 114096561c..0d9d531b05 100644
--- a/src/radiationModels/radiationModels/fvDOM/fvDOM.C
+++ b/src/radiationModels/radiationModels/fvDOM/fvDOM.C
@@ -266,8 +266,8 @@ Foam::radiationModels::fvDOM::fvDOM(const volScalarField& T)
         mesh_,
         dimensionedScalar(dimless/dimLength, 0)
     ),
-    nTheta_(readLabel(coeffs_.lookup("nTheta"))),
-    nPhi_(readLabel(coeffs_.lookup("nPhi"))),
+    nTheta_(coeffs_.lookup<label>("nTheta")),
+    nPhi_(coeffs_.lookup<label>("nPhi")),
     nRay_(0),
     nLambda_(absorptionEmission_->nBands()),
     aLambda_(nLambda_),
@@ -358,8 +358,8 @@ Foam::radiationModels::fvDOM::fvDOM
         mesh_,
         dimensionedScalar(dimless/dimLength, 0)
     ),
-    nTheta_(readLabel(coeffs_.lookup("nTheta"))),
-    nPhi_(readLabel(coeffs_.lookup("nPhi"))),
+    nTheta_(coeffs_.lookup<label>("nTheta")),
+    nPhi_(coeffs_.lookup<label>("nPhi")),
     nRay_(0),
     nLambda_(absorptionEmission_->nBands()),
     aLambda_(nLambda_),
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 5652d3984b..28887df872 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -435,10 +435,10 @@ kinematicSingleLayer::kinematicSingleLayer
 
     momentumPredictor_(solution().subDict("PISO").lookup("momentumPredictor")),
     nOuterCorr_(solution().subDict("PISO").lookupOrDefault("nOuterCorr", 1)),
-    nCorr_(readLabel(solution().subDict("PISO").lookup("nCorr"))),
+    nCorr_(solution().subDict("PISO").lookup<label>("nCorr")),
     nNonOrthCorr_
     (
-        readLabel(solution().subDict("PISO").lookup("nNonOrthCorr"))
+        solution().subDict("PISO").lookup<label>("nNonOrthCorr")
     ),
 
     cumulativeContErr_(0.0),
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index cf2461a053..24764078b1 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -277,7 +277,7 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
            << token::END_STATEMENT << nl;
 
         writeKeyword(os, "nLayers");
-        os << readLabel(dict_.lookup("nLayers"))
+        os << dict_.lookup<label>("nLayers")
            << token::END_STATEMENT << nl;
 
         writeKeyword(os, "expansionRatio");
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index 65426ccb7c..bcd29b7d6b 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -156,7 +156,7 @@ thermalBaffle::thermalBaffle
 )
 :
     thermalBaffleModel(modelType, mesh, dict),
-    nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))),
+    nNonOrthCorr_(solution().lookup<label>("nNonOrthCorr")),
     thermo_(solidThermo::New(regionMesh(), dict)),
     h_(thermo_->he()),
     Qs_
@@ -206,7 +206,7 @@ thermalBaffle::thermalBaffle
 )
 :
     thermalBaffleModel(modelType, mesh),
-    nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))),
+    nNonOrthCorr_(solution().lookup<label>("nNonOrthCorr")),
     thermo_(solidThermo::New(regionMesh())),
     h_(thermo_->he()),
     Qs_
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.C b/src/renumber/renumberMethods/springRenumber/springRenumber.C
index 55f5f41bab..ad05ac3bbf 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.C
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::springRenumber::springRenumber(const dictionary& renumberDict)
     renumberMethod(renumberDict),
     dict_(renumberDict.optionalSubDict(typeName+"Coeffs")),
     maxCo_(readScalar(dict_.lookup("maxCo"))),
-    maxIter_(readLabel(dict_.lookup("maxIter"))),
+    maxIter_(dict_.lookup<label>("maxIter")),
     freezeFraction_(readScalar(dict_.lookup("freezeFraction")))
 {}
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 96b0767c44..4efb786b06 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -254,7 +254,7 @@ void Foam::rigidBodyMeshMotion::solve()
 
     if (test_)
     {
-        label nIter(readLabel(coeffDict().lookup("nIter")));
+        label nIter(coeffDict().lookup<label>("nIter"));
 
         for (label i=0; i<nIter; i++)
         {
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index 14bc73fcc4..f725e74d34 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -201,7 +201,7 @@ void Foam::rigidBodyMeshMotionSolver::solve()
 
     if (test_)
     {
-        label nIter(readLabel(coeffDict().lookup("nIter")));
+        label nIter(coeffDict().lookup<label>("nIter"));
 
         for (label i=0; i<nIter; i++)
         {
diff --git a/src/sampling/sampledSet/arcUniform/arcUniform.C b/src/sampling/sampledSet/arcUniform/arcUniform.C
index dfa9f0c3d8..da5a957690 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniform.C
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,11 +127,11 @@ Foam::sampledSets::arcUniform::arcUniform
 :
     sampledSet(name, mesh, searchEngine, dict),
     centre_(dict.lookup("centre")),
-    normal_(normalised(dict.lookupType<vector>("normal"))),
-    radial_(dict.lookupType<vector>("radial")),
+    normal_(normalised(dict.lookup<vector>("normal"))),
+    radial_(dict.lookup<vector>("radial")),
     startAngle_(readScalar(dict.lookup("startAngle"))),
     endAngle_(readScalar(dict.lookup("endAngle"))),
-    nPoints_(dict.lookupType<scalar>("nPoints"))
+    nPoints_(dict.lookup<scalar>("nPoints"))
 {
     genSamples();
 
diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
index 540c20567a..8a47f5016b 100644
--- a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
+++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -231,7 +231,7 @@ Foam::sampledSets::boundaryRandom::boundaryRandom
             wordReList(dict.lookup("patches"))
         )
     ),
-    nPoints_(readLabel(dict.lookup("nPoints")))
+    nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
 
diff --git a/src/sampling/sampledSet/circleRandom/circleRandom.C b/src/sampling/sampledSet/circleRandom/circleRandom.C
index fbaa939f97..4d6982da52 100644
--- a/src/sampling/sampledSet/circleRandom/circleRandom.C
+++ b/src/sampling/sampledSet/circleRandom/circleRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,9 +132,9 @@ Foam::sampledSets::circleRandom::circleRandom
 :
     sampledSet(name, mesh, searchEngine, dict),
     centre_(dict.lookup("centre")),
-    normal_(normalised(dict.lookupType<vector>("normal"))),
+    normal_(normalised(dict.lookup<vector>("normal"))),
     radius_(readScalar(dict.lookup("radius"))),
-    nPoints_(readLabel(dict.lookup("nPoints")))
+    nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
 
diff --git a/src/sampling/sampledSet/lineUniform/lineUniform.C b/src/sampling/sampledSet/lineUniform/lineUniform.C
index 450f45d9d1..0d8901aebf 100644
--- a/src/sampling/sampledSet/lineUniform/lineUniform.C
+++ b/src/sampling/sampledSet/lineUniform/lineUniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ Foam::sampledSets::lineUniform::lineUniform
     sampledSet(name, mesh, searchEngine, dict),
     start_(dict.lookup("start")),
     end_(dict.lookup("end")),
-    nPoints_(readLabel(dict.lookup("nPoints")))
+    nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
 
diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandom.C b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
index a353c2b722..8429c56773 100644
--- a/src/sampling/sampledSet/sphereRandom/sphereRandom.C
+++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ Foam::sampledSets::sphereRandom::sphereRandom
     sampledSet(name, mesh, searchEngine, dict),
     centre_(dict.lookup("centre")),
     radius_(readScalar(dict.lookup("radius"))),
-    nPoints_(readLabel(dict.lookup("nPoints")))
+    nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C
index f876e66226..19e3bbb84c 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.C
+++ b/src/surfMesh/surfZone/surfZone/surfZone.C
@@ -81,8 +81,8 @@ Foam::surfZone::surfZone
 )
 :
     surfZoneIdentifier(name, dict, index),
-    size_(readLabel(dict.lookup("nFaces"))),
-    start_(readLabel(dict.lookup("startFace")))
+    size_(dict.lookup<label>("nFaces")),
+    start_(dict.lookup<label>("startFace"))
 {}
 
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index 7c1dd6f1a7..9d47f080c6 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -66,8 +66,8 @@ Foam::surfZoneIOList::surfZoneIOList
         {
             const dictionary& dict = dictEntries[zoneI].dict();
 
-            label zoneSize = readLabel(dict.lookup("nFaces"));
-            label startFacei = readLabel(dict.lookup("startFace"));
+            label zoneSize = dict.lookup<label>("nFaces");
+            label startFacei = dict.lookup<label>("startFace");
 
             zones[zoneI] = surfZone
             (
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
index b0d9e55144..79466e20f7 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
@@ -218,7 +218,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
 
         if (this->coeffsDict_.found("nbCLarge"))
         {
-            nbCLarge_ = readLabel(fuelDict.lookup("nbCLarge"));
+            nbCLarge_ = fuelDict.lookup<label>("nbCLarge");
         }
 
         fuelSpeciesID_.setSize(fuelSpecies_.size());
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEP.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEP.C
index a500d7c733..5753e0197c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEP.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEP.C
@@ -63,7 +63,7 @@ Foam::chemistryReductionMethods::DRGEP<CompType, ThermoType>::DRGEP
 
     if (this->coeffsDict_.found("NGroupBased"))
     {
-        NGroupBased_ = readLabel(this->coeffsDict_.lookup("NGroupBased"));
+        NGroupBased_ = this->coeffsDict_.template lookup<label>("NGroupBased");
     }
 
     const List<List<specieElement>>& specieComposition =
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C
index 64a10d405b..55ab5ca020 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -349,7 +349,7 @@ Foam::binaryTree<CompType, ThermoType>::binaryTree
 :
     chemistry_(chemistry),
     root_(nullptr),
-    maxNLeafs_(readLabel(coeffsDict.lookup("maxNLeafs"))),
+    maxNLeafs_(coeffsDict.lookup<label>("maxNLeafs")),
     size_(0),
     n2ndSearch_(0),
     max2ndSearch_(coeffsDict.lookupOrDefault("max2ndSearch",0)),
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/constant/constantThermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/constant/constantThermophysicalFunction.C
index 3190ec6bea..50d4302c2d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/constant/constantThermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/constant/constantThermophysicalFunction.C
@@ -42,7 +42,7 @@ namespace thermophysicalFunctions
 
 Foam::thermophysicalFunctions::constant::constant(const dictionary& dict)
 :
-    value_(dict.lookupType<scalar>("value"))
+    value_(dict.lookup<scalar>("value"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/table/tableThermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/table/tableThermophysicalFunction.C
index babd4d61de..f9b6daddbf 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/table/tableThermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/table/tableThermophysicalFunction.C
@@ -43,8 +43,8 @@ namespace thermophysicalFunctions
 Foam::thermophysicalFunctions::table::table(const dictionary& dict)
 :
     dictName_(dict.name()),
-    Tlow_(dict.lookupType<scalar>("Tlow")),
-    Thigh_(dict.lookupType<scalar>("Thigh")),
+    Tlow_(dict.lookup<scalar>("Tlow")),
+    Thigh_(dict.lookup<scalar>("Thigh")),
     values_(dict.lookup("values"))
 {
     if (values_.size() < 2)
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.C b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
index 838cd9604a..22e1e621b8 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatch.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
@@ -78,8 +78,8 @@ Foam::surfacePatch::surfacePatch
 )
 :
     geometricSurfacePatch(name, dict, index),
-    size_(readLabel(dict.lookup("nFaces"))),
-    start_(readLabel(dict.lookup("startFace")))
+    size_(dict.lookup<label>("nFaces")),
+    start_(dict.lookup<label>("startFace"))
 {}
 
 
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
index 35cc79012f..1c00762f4c 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,8 +78,8 @@ Foam::surfacePatchIOList::surfacePatchIOList
         {
             const dictionary& dict = patchEntries[patchi].dict();
 
-            label patchSize = readLabel(dict.lookup("nFaces"));
-            label startFacei = readLabel(dict.lookup("startFace"));
+            label patchSize = dict.lookup<label>("nFaces");
+            label startFacei = dict.lookup<label>("startFace");
 
             patches[patchi] =
                 surfacePatch