From ae40bd9f9bc378c5181ba90bf62afab27f8d7438 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 27 Jan 2020 13:38:26 +0100
Subject: [PATCH] STYLE: use guards for dictionary lookup()

---
 .../tabulatedWallFunction/general/general.C   | 13 +++++++++----
 .../tabulatedWallFunction/general/general.H   | 18 +++++++++---------
 .../ConeNozzleInjection/ConeNozzleInjection.C |  4 ++--
 .../molecule/moleculeCloud/moleculeCloud.C    |  5 ++++-
 .../potential/potential/potential.C           | 19 +++++++++++++------
 .../mappedPolyPatch/mappedPatchBase.C         |  2 --
 .../surfaceFeatures/surfaceFeatures.C         |  8 ++++----
 .../linearAxialAngularSpring.C                |  4 ++--
 .../prescribedRotation/prescribedRotation.C   |  4 ++--
 .../linearAxialAngularSpring.C                |  6 +++---
 10 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index ce402a7f14..7b6a0da77e 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +29,7 @@ License
 #include "general.H"
 #include "addToRunTimeSelectionTable.H"
 #include "Tuple2.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -135,12 +137,15 @@ Foam::tabulatedWallFunctions::general::general
 :
     tabulatedWallFunction(dict, mesh, typeName),
     interpType_(interpolationTypeNames_.get("interpType", coeffDict_)),
+    log10YPlus_(coeffDict_.get<bool>("log10YPlus")),
+    log10UPlus_(coeffDict_.get<bool>("log10UPlus")),
     yPlus_(),
-    uPlus_(),
-    log10YPlus_(coeffDict_.lookup("log10YPlus")),
-    log10UPlus_(coeffDict_.lookup("log10UPlus"))
+    uPlus_()
 {
-    List<Tuple2<scalar, scalar>> inputTable = coeffDict_.lookup("inputTable");
+    List<Tuple2<scalar, scalar>> inputTable;
+
+    coeffDict_.readEntry("inputTable", inputTable);
+
     if (inputTable.size() < 2)
     {
         FatalErrorInFunction
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
index 65e783deff..0ed51852d1 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +33,7 @@ Description
 
     Example dictionary specification:
 
+    \verbatim
         tabulatedWallFunction general;
 
         // Output table info
@@ -52,9 +54,8 @@ Description
                 ...
                 (yPlusValueN    uPlusValueN)
             );
-
         }
-
+    \endverbatim
 
 SourceFiles
     general.C
@@ -66,7 +67,6 @@ SourceFiles
 
 #include "tabulatedWallFunction.H"
 #include "Enum.H"
-#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -103,18 +103,18 @@ protected:
         //- Type of interpolation to apply when inverting the data set
         interpolationType interpType_;
 
+        //- Are y+ values entered as log10(y+)?
+        bool log10YPlus_;
+
+        //- Are U+ values entered as log10(U+)?
+        bool log10UPlus_;
+
         //- Input y+ values
         List<scalar> yPlus_;
 
         //- Input U+ values
         List<scalar> uPlus_;
 
-        //- Are y+ values entered as log10(y+)?
-        Switch log10YPlus_;
-
-        //- Are U+ values entered as log10(U+)?
-        Switch log10UPlus_;
-
 
     // Protected Member Functions
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index e96d23bdc7..5e66eef113 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,7 +69,7 @@ void Foam::ConeNozzleInjection<CloudType>::setInjectionMethod()
         case injectionMethod::imPoint:
         case injectionMethod::imDisc:
         {
-            position_ = this->coeffDict().lookup("position");
+            this->coeffDict().readEntry("position", position_);
             break;
         }
         case injectionMethod::imMovingPoint:
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index c293d21e35..8571efe9f1 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -67,7 +67,10 @@ void Foam::moleculeCloud::buildConstProps()
         const word& id = idList[i];
         const dictionary& molDict = moleculePropertiesDict.subDict(id);
 
-        List<word> siteIdNames = molDict.lookup("siteIds");
+        List<word> siteIdNames
+        (
+            molDict.lookup("siteIds")
+        );
 
         List<label> siteIds(siteIdNames.size());
 
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index 344cbe6020..f62987ca79 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +48,10 @@ void Foam::potential::setSiteIdList(const dictionary& moleculePropertiesDict)
 
         const dictionary& molDict(moleculePropertiesDict.subDict(id));
 
-        List<word> siteIdNames = molDict.lookup("siteIds");
+        List<word> siteIdNames
+        (
+            molDict.lookup("siteIds")
+        );
 
         forAll(siteIdNames, sI)
         {
@@ -59,7 +63,10 @@ void Foam::potential::setSiteIdList(const dictionary& moleculePropertiesDict)
             }
         }
 
-        List<word> pairPotSiteIds = molDict.lookup("pairPotentialSiteIds");
+        List<word> pairPotSiteIds
+        (
+            molDict.lookup("pairPotentialSiteIds")
+        );
 
         forAll(pairPotSiteIds, sI)
         {
@@ -111,7 +118,7 @@ void Foam::potential::potential::readPotentialDict()
         )
     );
 
-    idList_ = List<word>(idListDict.lookup("idList"));
+    idListDict.readEntry("idList", idList_);
 
     setSiteIdList
     (
@@ -156,10 +163,10 @@ void Foam::potential::potential::readPotentialDict()
 
     potentialDict.readEntry("potentialEnergyLimit", potentialEnergyLimit_);
 
-    if (potentialDict.found("removalOrder"))
-    {
-        List<word> remOrd = potentialDict.lookup("removalOrder");
+    List<word> remOrd;
 
+    if (potentialDict.readIfPresent("removalOrder", remOrd))
+    {
         removalOrder_.setSize(remOrd.size());
 
         forAll(removalOrder_, rO)
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 6b73086428..1a07f5c800 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -1057,7 +1057,6 @@ Foam::mappedPatchBase::mappedPatchBase
 
             case NONUNIFORM:
             {
-                //offsets_ = pointField(dict.lookup("offsets"));
                 offsets_ = readListOrField("offsets", dict, patch_.size());
             }
             break;
@@ -1076,7 +1075,6 @@ Foam::mappedPatchBase::mappedPatchBase
     else if (dict.found("offsets"))
     {
         offsetMode_ = NONUNIFORM;
-        //offsets_ = pointField(dict.lookup("offsets"));
         offsets_ = readListOrField("offsets", dict, patch_.size());
     }
     else if (mode_ != NEARESTPATCHFACE && mode_ != NEARESTPATCHFACEAMI)
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 11053f5ad1..422c78e4be 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -731,10 +731,10 @@ Foam::surfaceFeatures::surfaceFeatures
 
     dictionary featInfoDict(str);
 
-    featureEdges_ = labelList(featInfoDict.lookup("featureEdges"));
-    featurePoints_ = labelList(featInfoDict.lookup("featurePoints"));
-    externalStart_ = featInfoDict.get<label>("externalStart");
-    internalStart_ = featInfoDict.get<label>("internalStart");
+    featInfoDict.readEntry("featureEdges", featureEdges_);
+    featInfoDict.readEntry("featurePoints", featurePoints_);
+    featInfoDict.readEntry("externalStart", externalStart_);
+    featInfoDict.readEntry("internalStart", internalStart_);
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 8f6e20d832..17ba120d35 100644
--- a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -159,9 +159,9 @@ bool Foam::RBD::restraints::linearAxialAngularSpring::read
             << exit(FatalError);
     }
 
-    axis_ = coeffs_.lookup("axis");
+    coeffs_.readEntry("axis", axis_);
 
-    scalar magAxis(mag(axis_));
+    const scalar magAxis(mag(axis_));
 
     if (magAxis > VSMALL)
     {
diff --git a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
index 297dde3d65..197f15f43d 100644
--- a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
+++ b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
@@ -176,9 +176,9 @@ bool Foam::RBD::restraints::prescribedRotation::read
             << exit(FatalError);
     }
 
-    axis_ = coeffs_.lookup("axis");
+    coeffs_.readEntry("axis", axis_);
 
-    scalar magAxis(mag(axis_));
+    const scalar magAxis(mag(axis_));
 
     if (magAxis > VSMALL)
     {
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 13b4a82ae8..ae4bdf09a7 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -162,9 +162,9 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::read
             << exit(FatalError);
     }
 
-    axis_ = sDoFRBMRCoeffs_.lookup("axis");
+    sDoFRBMRCoeffs_.readEntry("axis", axis_);
 
-    scalar magAxis(mag(axis_));
+    const scalar magAxis(mag(axis_));
 
     if (magAxis > VSMALL)
     {