From ae36f5f504dcff9613393b8be2647d56d015f7bf Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 9 Aug 2018 11:27:36 +0200
Subject: [PATCH] ENH: change argList get<> and getList<> from read<>,
 readList<>

- more consistent with dictionary method naming. The get<> or
  getList<> returns a value, doesn't read into a existing location.
---
 .../test/PointEdgeWave/Test-PointEdgeWave.C   |  2 +-
 applications/test/argList/Test-argList.C      | 11 ++++++-
 .../test/decomposePar/Test-decomposePar.C     |  8 ++---
 .../findCell-octree/Test-findCell-octree.C    |  2 +-
 .../test/labelRanges/Test-labelRanges.C       |  4 +--
 .../momentOfInertia/Test-momentOfInertia.C    |  2 +-
 applications/test/spline/Test-spline.C        |  2 +-
 .../Test-surfaceMeshConvert.C                 |  2 +-
 .../combinePatchFaces/combinePatchFaces.C     |  8 +++--
 .../refineWallLayer/refineWallLayer.C         |  4 +--
 .../mesh/advanced/splitCells/splitCells.C     |  4 +--
 .../mesh/conversion/ansysToFoam/ansysToFoam.L |  2 +-
 .../mesh/conversion/ccm/ccmToFoam/ccmToFoam.C |  2 +-
 .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C   |  2 +-
 .../mesh/conversion/fireToFoam/fireToFoam.C   |  2 +-
 .../fluentMeshToFoam/fluentMeshToFoam.L       |  2 +-
 .../foamToStarMesh/foamToStarMesh.C           |  2 +-
 .../conversion/gambitToFoam/gambitToFoam.L    |  2 +-
 .../conversion/plot3dToFoam/plot3dToFoam.C    |  2 +-
 .../mesh/conversion/star4ToFoam/star4ToFoam.C |  2 +-
 .../foamyHexMeshSurfaceSimplify_non_octree.C  |  2 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  |  2 +-
 .../mesh/manipulation/autoPatch/autoPatch.C   |  2 +-
 .../manipulation/deformedGeom/deformedGeom.C  |  2 +-
 .../orientFaceZone/orientFaceZone.C           |  2 +-
 .../polyDualMesh/polyDualMeshApp.C            |  2 +-
 .../mesh/manipulation/rotateMesh/rotateMesh.C |  7 ++---
 .../mesh/manipulation/subsetMesh/subsetMesh.C |  6 ++--
 .../transformPoints/transformPoints.C         |  2 +-
 .../foamToEnsight/foamToEnsight.C             |  4 +--
 .../lumpedPointMovement/lumpedPointMovement.C |  7 ++---
 .../createExternalCoupledPatchGeometry.C      |  2 +-
 .../surfaceBooleanFeatures.C                  |  3 +-
 .../surface/surfaceClean/surfaceClean.C       |  4 +--
 .../surface/surfaceCoarsen/surfaceCoarsen.C   |  2 +-
 .../surface/surfaceHookUp/surfaceHookUp.C     |  2 +-
 .../surface/surfaceInertia/surfaceInertia.C   |  2 +-
 .../surface/surfaceInflate/surfaceInflate.C   |  4 +--
 .../surfaceLambdaMuSmooth.C                   |  6 ++--
 .../surfaceMeshTriangulate.C                  |  7 ++---
 .../surface/surfaceOrient/surfaceOrient.C     |  2 +-
 .../surfacePointMerge/surfacePointMerge.C     |  2 +-
 .../surfaceTransformPoints.C                  |  2 +-
 .../functionObjectList/functionObjectList.C   |  2 +-
 src/OpenFOAM/global/argList/argList.C         |  4 +--
 src/OpenFOAM/global/argList/argList.H         | 31 ++++++++++++-------
 src/OpenFOAM/global/argList/argListI.H        | 20 ++++++------
 47 files changed, 101 insertions(+), 99 deletions(-)

diff --git a/applications/test/PointEdgeWave/Test-PointEdgeWave.C b/applications/test/PointEdgeWave/Test-PointEdgeWave.C
index ff422a2943..0be9e261f9 100644
--- a/applications/test/PointEdgeWave/Test-PointEdgeWave.C
+++ b/applications/test/PointEdgeWave/Test-PointEdgeWave.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 
     labelList patchIDs
     (
-        pbm.patchSet(args.readList<wordRe>(1)).sortedToc()
+        pbm.patchSet(args.getList<wordRe>(1)).sortedToc()
     );
 
     Info<< "Starting walk from patches "
diff --git a/applications/test/argList/Test-argList.C b/applications/test/argList/Test-argList.C
index 9db0906c6a..ac62fce0ba 100644
--- a/applications/test/argList/Test-argList.C
+++ b/applications/test/argList/Test-argList.C
@@ -108,7 +108,9 @@ int main(int argc, char *argv[])
     if (args.found("label"))
     {
         Info<< "-label = " << args.opt<label>("label")
+            #ifdef Foam_argList_1712
             << " or " << args.optionRead<label>("label")  // old-compat
+            #endif
             << " or " << readLabel(args["label"])         // with function
             << nl;
     }
@@ -116,7 +118,9 @@ int main(int argc, char *argv[])
     if (args.found("scalar"))
     {
         Info<< "-scalar = " << args.opt<scalar>("scalar")
+            #ifdef Foam_argList_1712
             << " or " << args.optionRead<scalar>("scalar") // old-compat
+            #endif
             << " or " << readScalar(args["scalar"])        // with function
             << nl;
     }
@@ -124,7 +128,9 @@ int main(int argc, char *argv[])
     if (args.found("string"))
     {
         Info<< "-string = " << args.opt("string")
+            #ifdef Foam_argList_1712
             << " or " << args.optionRead<scalar>("string")  // old-compat
+            #endif
             << nl;
     }
 
@@ -133,8 +139,11 @@ int main(int argc, char *argv[])
     Info<< nl;
     for (label argi=1; argi < args.size(); ++argi)
     {
-        Info<< "arg[" << argi << "] = " << args.read<string>(argi)
+        Info<< "arg[" << argi << "] = " << args.get<string>(argi)
+            #ifdef Foam_argList_1712
+            << " or " << args.read<label>(argi)     // old-compat
             << " or " << args.argRead<label>(argi)  // old-compat
+            #endif
             << nl;
     }
 
diff --git a/applications/test/decomposePar/Test-decomposePar.C b/applications/test/decomposePar/Test-decomposePar.C
index 96d9f3726a..30445a26b7 100644
--- a/applications/test/decomposePar/Test-decomposePar.C
+++ b/applications/test/decomposePar/Test-decomposePar.C
@@ -109,12 +109,8 @@ int main(int argc, char *argv[])
     const bool allRegions = args.found("allRegions");
     const bool verbose    = args.found("verbose");
 
-    const label numSubdomains =
-        args.lookupOrDefault<label>("domains", 0);
-
-    const word methodName =
-        args.lookupOrDefault<word>("method", word::null);
-
+    const label numSubdomains = args.lookupOrDefault<label>("domains", 0);
+    const word methodName = args.lookupOrDefault<word>("method", word::null);
 
     // Set time from database
     #include "createTime.H"
diff --git a/applications/test/findCell-octree/Test-findCell-octree.C b/applications/test/findCell-octree/Test-findCell-octree.C
index 71c9ff270f..8059b09e40 100644
--- a/applications/test/findCell-octree/Test-findCell-octree.C
+++ b/applications/test/findCell-octree/Test-findCell-octree.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
     label nReps = 10000;
 
-    const point sample = args.read<point>(1);
+    const point sample = args.get<point>(1);
 
     const polyMesh::cellDecomposition decompMode = polyMesh::CELL_TETS;
 
diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index 2535f4cb63..d4162b4f16 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -101,8 +101,8 @@ int main(int argc, char *argv[])
         }
 
         {
-            label start = args.read<label>(argI);
-            label size  = args.read<label>(argI+1);
+            label start = args.get<label>(argI);
+            label size  = args.get<label>(argI+1);
             ++argI;
 
             range.reset(start, size);
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index c20bd481b5..201c7e004b 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
     }
 
     {
-        const label celli = args.lookupOrDefault("cell", 0);
+        const label celli = args.lookupOrDefault<label>("cell", 0);
 
         tensorField mI(momentOfInertia::meshInertia(mesh));
 
diff --git a/applications/test/spline/Test-spline.C b/applications/test/spline/Test-spline.C
index d3ed9c666a..2e75d267bd 100644
--- a/applications/test/spline/Test-spline.C
+++ b/applications/test/spline/Test-spline.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     bool useBSpline = args.found("B");
     bool useCatmullRom = args.found("CMR");
-    label nSeg = args.lookupOrDefault<label>("n", 20);
+    const label nSeg = args.lookupOrDefault<label>("n", 20);
 
     if (!useCatmullRom && !useBSpline)
     {
diff --git a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index 68c908920e..74e45613b6 100644
--- a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     const bool     optStdout = args.found("stdout");
-    const scalar scaleFactor = args.lookupOrDefault("scale", 0.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 0);
 
     const fileName importName = args[1];
     const fileName exportName = optStdout ? "-stdout" : args[2];
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index de1468a1a7..577f743570 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -366,13 +366,15 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar featureAngle = args.read<scalar>(1);
+    const scalar featureAngle = args.get<scalar>(1);
     const scalar minCos = Foam::cos(degToRad(featureAngle));
 
     // Sin of angle between two consecutive edges on a face.
     // If sin(angle) larger than this the face will be considered concave.
-    scalar concaveAngle = args.lookupOrDefault("concaveAngle", 30.0);
-    scalar concaveSin = Foam::sin(degToRad(concaveAngle));
+    const scalar concaveAngle =
+        args.lookupOrDefault<scalar>("concaveAngle", 30);
+
+    const scalar concaveSin = Foam::sin(degToRad(concaveAngle));
 
     const bool overwrite = args.found("overwrite");
     const bool meshQuality = args.found("meshQuality");
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index cb218fb62b..0579c5ef69 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -81,8 +81,8 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     // Find set of patches from the list of regular expressions provided
-    const wordRes patches(args.readList<wordRe>(1));
-    const scalar weight  = args.read<scalar>(2);
+    const wordRes patches(args.getList<wordRe>(1));
+    const scalar weight  = args.get<scalar>(2);
     const bool overwrite = args.found("overwrite");
 
     const labelHashSet patchSet(mesh.boundaryMesh().patchSet(patches));
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index c1fda4b123..a1e5a8fc01 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar featureAngle = args.read<scalar>(1);
+    const scalar featureAngle = args.get<scalar>(1);
     const scalar minCos = Foam::cos(degToRad(featureAngle));
     const scalar minSin = Foam::sin(degToRad(featureAngle));
 
@@ -564,7 +564,7 @@ int main(int argc, char *argv[])
     const bool geometry  = args.found("geometry");
     const bool overwrite = args.found("overwrite");
 
-    const scalar edgeTol = args.lookupOrDefault("tol", 0.2);
+    const scalar edgeTol = args.lookupOrDefault<scalar>("tol", 0.2);
 
     Info<< "Trying to split cells with internal angles > feature angle\n" << nl
         << "featureAngle      : " << featureAngle << nl
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index f9cdc42655..d3fd7fe772 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
index 7b833c8c05..dc98e24c84 100644
--- a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
+++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
     }
 
     // By default, no scaling
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
 
     // Default to binary output, unless otherwise specified
     const IOstream::streamFormat format =
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index edff7513d1..484f5955a9 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
index c6a5e46f09..63a5c71749 100644
--- a/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
+++ b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
     (
         args[1],
         // Default no scaling
-        args.lookupOrDefault("scale", 1.0)
+        args.lookupOrDefault<scalar>("scale", 1)
     );
 
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 669114ba03..064395df05 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -897,7 +897,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
 
     const bool writeSets  = args.found("writeSets");
     const bool writeZones = args.found("writeZones");
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index e6fb3311ba..c5e4c06ef8 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     }
 
     // Default rescale from [m] to [mm]
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1000.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1000);
     const bool  writeBndFile = !args.found("noBnd");
 
     #include "createPolyMesh.H"
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 74994a7dba..dfd13995bf 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -641,7 +641,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index 59eddb7afd..31beb1eb9b 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
 
     const bool readBlank = !args.found("noBlank");
     const bool singleBlock = args.found("singleBlock");
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index be403f76e6..13d08dfdd0 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
         prefix,
         runTime,
         // Default rescale from [mm] to [m]
-        args.lookupOrDefault("scale", 0.001),
+        args.lookupOrDefault<scalar>("scale", 0.001),
         args.found("solids")
     );
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
index d042edd9b1..9607b1be26 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const labelVector n(args.read<labelVector>(1));
+    const labelVector n(args.get<labelVector>(1));
     const fileName exportName = args[2];
 
     Info<< "Reading surfaces as specified in the foamyHexMeshDict and"
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 1f83d6673e..d899194c19 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -1667,7 +1667,7 @@ int main(int argc, char *argv[])
         {
             includePatches = bMesh.patchSet
             (
-                args.readList<wordRe>("patches")
+                args.getList<wordRe>("patches")
             );
         }
         else
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index 6919e49d48..8e9e884847 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
         << " s\n" << endl << endl;
 
 
-    const scalar featureAngle = args.read<scalar>(1);
+    const scalar featureAngle = args.get<scalar>(1);
     const bool overwrite      = args.found("overwrite");
 
     const scalar minCos = Foam::cos(degToRad(featureAngle));
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index 0e5c4941aa..81f027fcf7 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const scalar scaleFactor = args.read<scalar>(1);
+    const scalar scaleFactor = args.get<scalar>(1);
 
     #include "createTime.H"
     #include "createNamedMesh.H"
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index 947d593625..2a05649e77 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     #include "createNamedPolyMesh.H"
 
     const word zoneName  = args[1];
-    const point outsidePoint = args.read<point>(2);
+    const point outsidePoint = args.get<point>(2);
 
     Info<< "Orienting faceZone " << zoneName
         << " such that " << outsidePoint << " is outside"
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index 5e28ada61e..88f949782d 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -401,7 +401,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    const scalar featureAngle = args.read<scalar>(1);
+    const scalar featureAngle = args.get<scalar>(1);
     const scalar minCos = Foam::cos(degToRad(featureAngle));
 
     Info<< "Feature:" << featureAngle << endl
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index aac00fb6fb..4634356a68 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -83,11 +83,8 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    vector n1(args.read<vector>(1));
-    n1 /= mag(n1);
-
-    vector n2(args.read<vector>(2));
-    n2 /= mag(n2);
+    const vector n1(args.get<vector>(1).normalise());
+    const vector n2(args.get<vector>(2).normalise());
 
     const tensor rotT(rotationTensor(n1, n2));
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 4c9c47924b..6ab578d722 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -391,7 +391,6 @@ int main(int argc, char *argv[])
         meshInstance = fieldsInstance;
     }
 
-
     Info<< "Reading cell set from " << selectionName << nl << endl;
 
 
@@ -400,12 +399,12 @@ int main(int argc, char *argv[])
 
     if (args.found("patches"))
     {
-        const wordRes patchNames(args.readList<wordRe>("patches"));
+        const wordRes patchNames(args.getList<wordRe>("patches"));
 
         exposedPatchIDs = mesh.boundaryMesh().patchSet(patchNames).sortedToc();
 
         Info<< "Adding exposed internal faces to nearest of patches "
-            << patchNames << nl << endl;
+            << flatOutput(patchNames) << nl << endl;
 
         if (exposedPatchIDs.empty())
         {
@@ -414,7 +413,6 @@ int main(int argc, char *argv[])
                 << mesh.boundaryMesh().names()
                 << exit(FatalError);
         }
-
     }
     else if (args.found("patch"))
     {
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 06abc23d3a..a7132dae22 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -363,7 +363,7 @@ int main(int argc, char *argv[])
     List<scalar> scaling;
     if (args.readListIfPresent("scale", scaling))
     {
-        // readList handles single or multiple values
+        // readListIfPresent handles single or multiple values
 
         if (scaling.size() == 1)
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 4905d45646..3de907152b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -237,11 +237,11 @@ int main(int argc, char *argv[])
 
     if (args.found("patches"))
     {
-        writeOpts.patchSelection(args.readList<wordRe>("patches"));
+        writeOpts.patchSelection(args.getList<wordRe>("patches"));
     }
     if (args.found("faceZones"))
     {
-        writeOpts.faceZoneSelection(args.readList<wordRe>("faceZones"));
+        writeOpts.faceZoneSelection(args.getList<wordRe>("faceZones"));
     }
 
     //
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C b/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
index f158354777..f603e34896 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
@@ -90,11 +90,8 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const label maxOut =
-        Foam::max(0, args.lookupOrDefault<label>("max", 0));
-
-    const label span =
-        Foam::max(1, args.lookupOrDefault<label>("span", 1));
+    const label maxOut = Foam::max(0, args.lookupOrDefault<label>("max", 0));
+    const label span   = Foam::max(1, args.lookupOrDefault<label>("span", 1));
 
     const scalar relax = args.lookupOrDefault<scalar>("scale", 1);
 
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index 08c611d7bc..1be51398da 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
         args.readIfPresent("regions", regionNames);
     }
 
-    const wordRe patchGroup(args.read<wordRe>(1));
+    const wordRe patchGroup(args.get<wordRe>(1));
 
     fileName commsDir(runTime.path()/"comms");
     args.readIfPresent("commsDir", commsDir);
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index e36e54a249..814cec9ce9 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1591,8 +1591,7 @@ int main(int argc, char *argv[])
 
 
     // Scale factor for both surfaces:
-    const scalar scaleFactor
-        = args.lookupOrDefault<scalar>("scale", -1);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
 
     const word surf1Name(args[2]);
     Info<< "Reading surface " << surf1Name << endl;
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index 8c5bb041f4..138ea2d402 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -71,8 +71,8 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
-    const scalar minLen = args.read<scalar>(2);
-    const scalar minQuality = args.read<scalar>(3);
+    const scalar minLen = args.get<scalar>(2);
+    const scalar minQuality = args.get<scalar>(3);
     const fileName outFileName = args[4];
 
     Info<< "Reading surface " << inFileName << nl
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 4d180bcc2e..df7b9f2b17 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
-    const scalar reduction = args.read<scalar>(2);
+    const scalar reduction = args.get<scalar>(2);
     const fileName outFileName = args[3];
 
     if (reduction <= 0 || reduction > 1)
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 736352f5ec..9e28c823f8 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
 
     const IOdictionary dict(dictIO);
 
-    const scalar dist(args.read<scalar>(1));
+    const scalar dist(args.get<scalar>(1));
     const scalar matchTolerance(max(1e-6*dist, SMALL));
     const label maxIters = 100;
 
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index ad9f659b82..ca7a361234 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar density = args.lookupOrDefault("density", 1.0);
+    const scalar density = args.lookupOrDefault<scalar>("density", 1);
 
     vector refPt = Zero;
     bool calcAroundRefPt = args.readIfPresent("referencePoint", refPt);
diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
index e32b7e5d98..83c5d147a0 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -607,8 +607,8 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     const word inputName(args[1]);
-    const scalar distance(args.read<scalar>(2));
-    const scalar extendFactor(args.read<scalar>(3));
+    const scalar distance(args.get<scalar>(2));
+    const scalar extendFactor(args.get<scalar>(3));
     const bool checkSelfIntersect = args.found("checkSelfIntersection");
     const label nSmooth = args.lookupOrDefault("nSmooth", 10);
     const scalar featureAngle = args.lookupOrDefault<scalar>
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index caab9dc86f..6485163063 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -146,9 +146,9 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar lambda = args.read<scalar>(2);
-    const scalar mu = args.read<scalar>(3);
-    const label  iters = args.read<label>(4);
+    const scalar lambda = args.get<scalar>(2);
+    const scalar mu = args.get<scalar>(3);
+    const label  iters = args.get<label>(4);
     const fileName outFileName = args[5];
 
     if (lambda < 0 || lambda > 1)
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 6e8c704173..f18cf71f50 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -173,10 +173,7 @@ int main(int argc, char *argv[])
 
         if (args.found("patches"))
         {
-            includePatches = bMesh.patchSet
-            (
-                args.readList<wordRe>("patches")
-            );
+            includePatches = bMesh.patchSet(args.getList<wordRe>("patches"));
         }
         else
         {
@@ -197,7 +194,7 @@ int main(int argc, char *argv[])
 
         if (args.found("faceZones"))
         {
-            wordReList zoneNames(args.readList<wordRe>("faceZones"));
+            wordReList zoneNames(args.getList<wordRe>("faceZones"));
             const wordList allZoneNames(fzm.names());
             for (const wordRe& zoneName : zoneNames)
             {
diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
index f159937858..cb1ca6a09e 100644
--- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C
+++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const point visiblePoint    = args.read<point>(2);
+    const point visiblePoint    = args.get<point>(2);
     const fileName outFileName  = args[3];
 
     const bool orientInside = args.found("inside");
diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
index 6414454756..e84ed8e5c1 100644
--- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
+++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar   mergeTol = args.read<scalar>(2);
+    const scalar   mergeTol = args.get<scalar>(2);
     const fileName outFileName = args[3];
 
     const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 1a59ab3b50..10d389e857 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
     List<scalar> scaling;
     if (args.readListIfPresent("scale", scaling))
     {
-        // readList handles single or multiple values
+        // readListIfPresent handles single or multiple values
 
         if (scaling.size() == 1)
         {
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index f35e6f7ee7..db9902b94f 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -435,7 +435,7 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
     {
         modifiedControlDict = true;
 
-        wordList funcNames = args.readList<word>("funcs");
+        wordList funcNames = args.getList<word>("funcs");
 
         for (const word& funcName : funcNames)
         {
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 523724d131..deb7a9412b 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1117,12 +1117,10 @@ void Foam::argList::parse
 
             // If running distributed (different roots for different procs)
             label dictNProcs = -1;
-            if (options_.found("roots"))
+            if (this->readListIfPresent("roots", roots))
             {
                 distributed_ = true;
                 source = "-roots";
-                roots = this->readList<fileName>("roots");
-
                 if (roots.size() != 1)
                 {
                     dictNProcs = roots.size()+1;
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 8103829bf7..42448c3b5c 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -317,15 +317,15 @@ public:
         //- Return non-const access to the command options
         inline HashTable<string>& options();
 
-        //- Read a value from the argument at index.
-        //  Index 1 is the first non-option argument.
+        //- Get a value from the argument at index.
+        //  Index 1 is the first (non-option) argument.
         template<class T>
-        inline T read(const label index) const;
+        inline T get(const label index) const;
 
         //- Read a value from the argument at index.
-        //  Index 1 is the first non-option argument.
+        //  Index 1 is the first (non-option) argument.
         template<class T>
-        inline List<T> readList(const label index) const;
+        inline List<T> getList(const label index) const;
 
         //- Return true if the named option is found
         inline bool found(const word& optName) const;
@@ -372,7 +372,7 @@ public:
         //- Read a List of values from the named option,
         //- treating a single entry like a list of size 1.
         template<class T>
-        inline List<T> readList(const word& optName) const;
+        inline List<T> getList(const word& optName) const;
 
         //- If named option is present, read a List of values
         //- treating a single entry like a list of size 1.
@@ -516,7 +516,7 @@ public:
 
         //- The string corresponding to the argument index.
         //  Index 0 is the executable.
-        //  Index 1 is the first non-option argument.
+        //  Index 1 is the first (non-option) argument.
         inline const string& operator[](const label index) const;
 
         //- The string associated with the named option
@@ -528,12 +528,21 @@ public:
     #ifdef Foam_argList_1712
 
         //- Read a value from the argument at index.
-        //  Index 1 is the first non-option argument.
+        //  Index 1 is the first (non-option) argument.
+        //  \deprecated in favour of get() - AUG-2018
+        template<class T>
+        inline T read(const label index) const
+        {
+            return this->get<T>(index);
+        }
+
+        //- Read a value from the argument at index.
+        //  Index 1 is the first (non-option) argument.
         //  \deprecated in favour of read() - JAN-2018
         template<class T>
         inline T argRead(const label index) const
         {
-            return this->read<T>(index);
+            return this->get<T>(index);
         }
 
         //- Return true if the named option is found
@@ -600,11 +609,11 @@ public:
         }
 
         //- Read a List of values from the named option
-        //  \deprecated in favour of readList() - JAN-2018
+        //  \deprecated in favour of getList() - JAN-2018
         template<class T>
         inline List<T> optionReadList(const word& optName) const
         {
-            return this->readList<T>(optName);
+            return this->getList<T>(optName);
         }
 
     #endif  /* Foam_argList_1712 */
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index d133ab1b18..83b521f923 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -133,22 +133,22 @@ inline Foam::ITstream Foam::argList::lookup(const word& optName) const
 
 namespace Foam
 {
-    template<> inline int32_t argList::read<int32_t>(const label index) const
+    template<> inline int32_t argList::get<int32_t>(const label index) const
     {
         return Foam::readInt32(args_[index]);
     }
 
-    template<> inline int64_t argList::read<int64_t>(const label index) const
+    template<> inline int64_t argList::get<int64_t>(const label index) const
     {
         return Foam::readInt64(args_[index]);
     }
 
-    template<> inline float argList::read<float>(const label index) const
+    template<> inline float argList::get<float>(const label index) const
     {
         return Foam::readFloat(args_[index]);
     }
 
-    template<> inline double argList::read<double>(const label index) const
+    template<> inline double argList::get<double>(const label index) const
     {
         return Foam::readDouble(args_[index]);
     }
@@ -176,19 +176,19 @@ namespace Foam
 
 
     template<>
-    inline string argList::read<Foam::string>(const label index) const
+    inline string argList::get<Foam::string>(const label index) const
     {
         return args_[index];
     }
 
     template<>
-    inline word argList::read<Foam::word>(const label index) const
+    inline word argList::get<Foam::word>(const label index) const
     {
         return args_[index];
     }
 
     template<>
-    inline fileName argList::read<Foam::fileName>(const label index) const
+    inline fileName argList::get<Foam::fileName>(const label index) const
     {
         return args_[index];
     }
@@ -217,7 +217,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-inline T Foam::argList::read(const label index) const
+inline T Foam::argList::get(const label index) const
 {
     ITstream is(Foam::name(index), args_[index]);
 
@@ -296,7 +296,7 @@ inline T Foam::argList::lookupOrDefault
 
 
 template<class T>
-inline Foam::List<T> Foam::argList::readList(const label index) const
+inline Foam::List<T> Foam::argList::getList(const label index) const
 {
     ITstream is(Foam::name(index), args_[index]);
 
@@ -310,7 +310,7 @@ inline Foam::List<T> Foam::argList::readList(const label index) const
 
 
 template<class T>
-inline Foam::List<T> Foam::argList::readList(const word& optName) const
+inline Foam::List<T> Foam::argList::getList(const word& optName) const
 {
     ITstream is(optName, options_[optName]);