From 1310e852252f12ed69ea33bab07b8cc259bac830 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 26 Nov 2019 21:07:11 +0100
Subject: [PATCH] ENH: support 'get()' for retrieving argList options

- previously only had 'opt<..>()' for options, but 'get<..>()'
  provides more similarity with dictionary methods.
  The 'opt<..>()' method is retained.
---
 .../basic/potentialFoam/createFields.H        |  2 +-
 .../overPotentialFoam/createFields.H          |  2 +-
 .../solvers/lagrangian/DPMFoam/createFields.H |  2 +-
 .../createFields.H                            |  2 +-
 .../createFields.H                            |  2 +-
 applications/test/argList/Test-argList.C      | 11 ++--
 .../Test-checkDecomposePar.C                  |  2 +-
 .../test/decomposePar/Test-decomposePar.C     |  8 +--
 .../Test-externalFileCoupler.C                |  2 +-
 .../momentOfInertia/Test-momentOfInertia.C    |  2 +-
 applications/test/spline/Test-spline.C        |  2 +-
 .../test/stringSplit/Test-stringSplit.C       |  2 +-
 .../Test-surfaceIntersection.C                |  4 +-
 .../Test-surfaceMeshConvert.C                 |  2 +-
 applications/test/tokenize/Test-tokenize.C    |  2 +-
 .../vtkSeriesWriter/Test-vtkSeriesWriter.C    |  4 +-
 .../combinePatchFaces/combinePatchFaces.C     |  2 +-
 .../mesh/advanced/splitCells/splitCells.C     |  2 +-
 .../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/foamToSurface/foamToSurface.C  |  2 +-
 .../conversion/gambitToFoam/gambitToFoam.L    |  2 +-
 .../mesh/conversion/kivaToFoam/kivaToFoam.C   |  4 +-
 .../conversion/plot3dToFoam/plot3dToFoam.C    |  2 +-
 .../mesh/conversion/star4ToFoam/star4ToFoam.C |  2 +-
 .../conversion/writeMeshObj/writeMeshObj.C    |  6 +--
 .../extrude/extrudeMesh/extrudeMesh.C         |  2 +-
 .../foamyMesh/foamyHexMesh/foamyHexMesh.C     |  2 +-
 .../foamyHexMeshBackgroundMesh.C              |  4 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  |  4 +-
 .../mesh/manipulation/checkMesh/checkMesh.C   |  2 +-
 .../manipulation/createPatch/createPatch.C    |  2 +-
 .../manipulation/mergeMeshes/mergeMeshes.C    |  4 +-
 .../mesh/manipulation/refineMesh/refineMesh.C |  2 +-
 .../splitMeshRegions/splitMeshRegions.C       |  2 +-
 .../mesh/manipulation/subsetMesh/subsetMesh.C |  2 +-
 .../transformPoints/transformPoints.C         |  2 +-
 .../decomposePar/decomposePar.C               |  4 +-
 .../reconstructParMesh/reconstructParMesh.C   |  2 +-
 .../redistributePar/redistributePar.C         |  6 +--
 .../foamToEnsight/foamToEnsight.C             |  4 +-
 .../foamToEnsightParts/foamToEnsightParts.C   |  4 +-
 .../dataConversion/foamToVTK/foamToVTK.C      |  4 +-
 .../lumpedPointMovement/lumpedPointMovement.C |  6 +--
 .../temporalInterpolate/temporalInterpolate.C |  4 +-
 .../postProcessing/postProcess/postProcess.C  |  2 +-
 .../applyBoundaryLayer/createFields.H         |  4 +-
 .../createZeroDirectory/createZeroDirectory.C |  2 +-
 .../foamUpgradeCyclics/foamUpgradeCyclics.C   |  2 +-
 .../preProcessing/mapFields/mapFields.C       |  2 +-
 .../preProcessing/mapFields/setTimeIndex.H    |  2 +-
 .../preProcessing/mapFieldsPar/setTimeIndex.H |  2 +-
 .../utilities/surface/surfaceAdd/surfaceAdd.C |  2 +-
 .../surfaceBooleanFeatures.C                  |  2 +-
 .../surface/surfaceCheck/surfaceCheck.C       |  4 +-
 .../surface/surfaceClean/surfaceClean.C       |  2 +-
 .../surface/surfaceCoarsen/surfaceCoarsen.C   |  2 +-
 .../surface/surfaceConvert/surfaceConvert.C   |  2 +-
 .../surface/surfaceFind/surfaceFind.C         |  6 +--
 .../surface/surfaceInertia/surfaceInertia.C   |  2 +-
 .../surface/surfaceInflate/surfaceInflate.C   |  4 +-
 .../surfaceMeshConvert/surfaceMeshConvert.C   |  2 +-
 .../surfaceMeshExport/surfaceMeshExport.C     |  4 +-
 .../surfaceMeshImport/surfaceMeshImport.C     |  4 +-
 .../surface/surfaceMeshInfo/surfaceMeshInfo.C |  2 +-
 .../surface/surfaceOrient/surfaceOrient.C     |  2 +-
 .../surfacePointMerge/surfacePointMerge.C     |  2 +-
 .../surfaceRedistributePar.C                  |  2 +-
 .../surface/surfaceToPatch/surfaceToPatch.C   |  2 +-
 .../functionObjectList/functionObjectList.C   |  2 +-
 src/OpenFOAM/global/argList/argList.H         | 51 +++++++++++--------
 src/OpenFOAM/global/argList/argListI.H        | 24 ++++-----
 src/OpenFOAM/include/checkTimeOption.H        |  2 +-
 .../include/setConstantMeshDictionaryIO.H     |  2 +-
 .../include/setConstantRunTimeDictionaryIO.H  |  2 +-
 .../include/setSystemMeshDictionaryIO.H       |  2 +-
 .../include/setSystemRunTimeDictionaryIO.H    |  2 +-
 81 files changed, 155 insertions(+), 141 deletions(-)

diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index 0ce5a68edd..89460e2037 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -40,7 +40,7 @@ if (args.found("initialiseUBCs"))
 // converting fixed-value BCs to zero-gradient and vice versa.
 
 // Allow override from command-line -pName option
-const word pName = args.opt<word>("pName", "p");
+const word pName = args.get<word>("pName", "p");
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
index d39f3044b7..1f4f06550c 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
@@ -40,7 +40,7 @@ if (args.found("initialiseUBCs"))
 // converting fixed-value BCs to zero-gradient and vice versa.
 
 // Allow override from command-line -pName option
-const word pName = args.opt<word>("pName", "p");
+const word pName = args.get<word>("pName", "p");
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 07ff05738b..7e386cf415 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -121,7 +121,7 @@ volScalarField alphac
 
 const word kinematicCloudName
 (
-    args.opt<word>("cloud", "kinematicCloud")
+    args.get<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 1031e81a9a..3191bbf7a7 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -59,7 +59,7 @@ volScalarField mu
 
 const word kinematicCloudName
 (
-    args.opt<word>("cloud", "kinematicCloud")
+    args.get<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index f4675bbdb6..bf12d76bd8 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 const word kinematicCloudName
 (
-    args.opt<word>("cloud", "kinematicCloud")
+    args.get<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/test/argList/Test-argList.C b/applications/test/argList/Test-argList.C
index b7edb5adcf..2ec91ec05c 100644
--- a/applications/test/argList/Test-argList.C
+++ b/applications/test/argList/Test-argList.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -126,7 +126,8 @@ int main(int argc, char *argv[])
     Info<< nl;
     if (args.found("label"))
     {
-        Info<< "-label = " << args.opt<label>("label")
+        Info<< "-label = " << args.get<label>("label")
+            << " or " << args.opt<label>("label")
             #ifdef Foam_argList_1712
             << " or " << args.optionRead<label>("label")  // old-compat
             #endif
@@ -136,7 +137,8 @@ int main(int argc, char *argv[])
 
     if (args.found("scalar"))
     {
-        Info<< "-scalar = " << args.opt<scalar>("scalar")
+        Info<< "-scalar = " << args.get<scalar>("scalar")
+            << " or " << args.opt<scalar>("label")
             #ifdef Foam_argList_1712
             << " or " << args.optionRead<scalar>("scalar") // old-compat
             #endif
@@ -146,7 +148,8 @@ int main(int argc, char *argv[])
 
     if (args.found("string"))
     {
-        Info<< "-string = " << args.opt("string")
+        Info<< "-string = " << args.get("string")
+            << " or " << args.opt("string")
             #ifdef Foam_argList_1712
             << " or " << args.optionRead<scalar>("string")  // old-compat
             #endif
diff --git a/applications/test/checkDecomposePar/Test-checkDecomposePar.C b/applications/test/checkDecomposePar/Test-checkDecomposePar.C
index c6f581a495..99ea6a2435 100644
--- a/applications/test/checkDecomposePar/Test-checkDecomposePar.C
+++ b/applications/test/checkDecomposePar/Test-checkDecomposePar.C
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     instantList times = timeSelector::selectIfPresent(runTime, args);
 
     // Allow override of decomposeParDict location
-    const fileName decompDictFile = args.opt<fileName>("decomposeParDict", "");
+    const fileName decompDictFile = args.get<fileName>("decomposeParDict", "");
 
     wordList regionNames;
     wordList regionDirs;
diff --git a/applications/test/decomposePar/Test-decomposePar.C b/applications/test/decomposePar/Test-decomposePar.C
index 90ee2a396d..3a719f375a 100644
--- a/applications/test/decomposePar/Test-decomposePar.C
+++ b/applications/test/decomposePar/Test-decomposePar.C
@@ -100,8 +100,8 @@ int main(int argc, char *argv[])
     const bool allRegions = args.found("allRegions");
     const bool verbose    = args.found("verbose");
 
-    const label numSubdomains = args.opt<label>("domains", 0);
-    const word methodName = args.opt<word>("method", word::null);
+    const label numSubdomains = args.get<label>("domains", 0);
+    const word methodName = args.get<word>("method", word::null);
 
     // Set time from database
     #include "createTime.H"
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
     instantList times = timeSelector::selectIfPresent(runTime, args);
 
     // Allow override of decomposeParDict location
-    const fileName decompDictFile = args.opt<fileName>("decomposeParDict", "");
+    const fileName decompDictFile = args.get<fileName>("decomposeParDict", "");
 
     // Get all region names
     wordList regionNames;
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
     else
     {
         regionNames.resize(1);
-        regionNames.first() = args.opt<word>("region", fvMesh::defaultRegion);
+        regionNames.first() = args.get<word>("region", fvMesh::defaultRegion);
     }
 
     forAll(regionNames, regioni)
diff --git a/applications/test/externalFileCoupler/Test-externalFileCoupler.C b/applications/test/externalFileCoupler/Test-externalFileCoupler.C
index 610d74780e..7a7b8007c2 100644
--- a/applications/test/externalFileCoupler/Test-externalFileCoupler.C
+++ b/applications/test/externalFileCoupler/Test-externalFileCoupler.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const label maxCount = args.opt<label>("max", 1000);
+    const label maxCount = args.get<label>("max", 1000);
 
     externalFileCoupler coupler;
 
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index f7e3f56539..b5e67de4aa 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
     }
 
     {
-        const label celli = args.opt<label>("cell", 0);
+        const label celli = args.get<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 b04e7ff3f1..869eb844b7 100644
--- a/applications/test/spline/Test-spline.C
+++ b/applications/test/spline/Test-spline.C
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
 
     bool useBSpline = args.found("B");
     bool useCatmullRom = args.found("CMR");
-    const label nSeg = args.opt<label>("n", 20);
+    const label nSeg = args.get<label>("n", 20);
 
     if (!useCatmullRom && !useBSpline)
     {
diff --git a/applications/test/stringSplit/Test-stringSplit.C b/applications/test/stringSplit/Test-stringSplit.C
index 99b8ca34b5..2994d384f4 100644
--- a/applications/test/stringSplit/Test-stringSplit.C
+++ b/applications/test/stringSplit/Test-stringSplit.C
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
 
     if (args.found("fixed"))
     {
-        const label width = args.opt<label>("fixed");
+        const label width = args.get<label>("fixed");
 
         Info<< "split on fixed width = " << width << nl
             << "~~~~~~~~~~~~~~" << nl;
diff --git a/applications/test/surfaceIntersection/Test-surfaceIntersection.C b/applications/test/surfaceIntersection/Test-surfaceIntersection.C
index 3ff5362f7e..bd3ba4487a 100644
--- a/applications/test/surfaceIntersection/Test-surfaceIntersection.C
+++ b/applications/test/surfaceIntersection/Test-surfaceIntersection.C
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const scalar scaleFactor = args.opt<scalar>("scale", -1);
+    const scalar scaleFactor = args.get<scalar>("scale", -1);
 
     const word outputFile(args.executable() + ".obj");
 
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
     word mergeOp;
     if (args.found("mergePoints"))
     {
-        cuts.mergePoints(args.opt<scalar>("mergePoints"));
+        cuts.mergePoints(args.get<scalar>("mergePoints"));
         mergeOp = "mergePoints";
     }
     else if (args.found("mergeEdges"))
diff --git a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index 44d4658d8d..9b00d144cd 100644
--- a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     const bool     optStdout = args.found("stdout");
-    const scalar scaleFactor = args.opt<scalar>("scale", 0);
+    const scalar scaleFactor = args.get<scalar>("scale", 0);
 
     const fileName importName = args[1];
     const fileName exportName = optStdout ? "-stdout" : args[2];
diff --git a/applications/test/tokenize/Test-tokenize.C b/applications/test/tokenize/Test-tokenize.C
index e6b0b0083c..b62adf796e 100644
--- a/applications/test/tokenize/Test-tokenize.C
+++ b/applications/test/tokenize/Test-tokenize.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv, false, true);
 
-    const label repeat = args.opt<label>("repeat", 1);
+    const label repeat = args.get<label>("repeat", 1);
 
     const bool optVerbose = args.found("verbose");
 
diff --git a/applications/test/vtkSeriesWriter/Test-vtkSeriesWriter.C b/applications/test/vtkSeriesWriter/Test-vtkSeriesWriter.C
index a90bf60d95..56504c711e 100644
--- a/applications/test/vtkSeriesWriter/Test-vtkSeriesWriter.C
+++ b/applications/test/vtkSeriesWriter/Test-vtkSeriesWriter.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv, false, true);
 
-    const scalar currTime = args.opt<scalar>("time", GREAT);
+    const scalar currTime = args.get<scalar>("time", GREAT);
 
     Info<< "Using currTime = " << currTime << nl
         << "when loading " << (args.size()-1) << " files" << nl << nl;
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
     {
         vtk::seriesWriter writer;
 
-        writer.scan(args.opt<fileName>("scan"));
+        writer.scan(args.get<fileName>("scan"));
 
         Info<< "scanned for files" << nl;
         writer.print(Info);
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 0288a4f374..e54c3325c9 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
 
     // Sin of angle between two consecutive edges on a face.
     // If sin(angle) larger than this the face will be considered concave.
-    const scalar concaveAngle = args.opt<scalar>("concaveAngle", 30);
+    const scalar concaveAngle = args.get<scalar>("concaveAngle", 30);
 
     const scalar concaveSin = Foam::sin(degToRad(concaveAngle));
 
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 9a323c8d1f..417819c142 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -561,7 +561,7 @@ int main(int argc, char *argv[])
     const bool geometry  = args.found("geometry");
     const bool overwrite = args.found("overwrite");
 
-    const scalar edgeTol = args.opt<scalar>("tol", 0.2);
+    const scalar edgeTol = args.get<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 a630eb3817..8f097f17b7 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", 1);
+    const scalar scaleFactor = args.get<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 a444c5428c..dede3f2a6a 100644
--- a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
+++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
     }
 
     // By default, no scaling
-    const scalar scaleFactor = args.opt<scalar>("scale", 1);
+    const scalar scaleFactor = args.get<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 14467408f4..ea89273200 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", 1);
+    const scalar scaleFactor = args.get<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 0637dfb2bb..952141faab 100644
--- a/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
+++ b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
     (
         args[1],
         // Default no scaling
-        args.opt<scalar>("scale", 1)
+        args.get<scalar>("scale", 1)
     );
 
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 3505c9e779..877b844c66 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -904,7 +904,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", 1);
+    const scalar scaleFactor = args.get<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 23a39415ed..c37c7dcf8c 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
     }
 
     // Default rescale from [m] to [mm]
-    const scalar scaleFactor = args.opt<scalar>("scale", 1000);
+    const scalar scaleFactor = args.get<scalar>("scale", 1000);
     const bool  writeBndFile = !args.found("noBnd");
 
     #include "createPolyMesh.H"
diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
index 139f701637..4d684cdb74 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
+++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 
     fileName exportName = args[1];
 
-    const scalar scaleFactor = args.opt<scalar>("scale", 0);
+    const scalar scaleFactor = args.get<scalar>("scale", 0);
     const bool doTriangulate = args.found("tri");
 
     fileName exportBase = exportName.lessExt();
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 177b3e2514..bb213665cf 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -648,7 +648,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", 1);
+    const scalar scaleFactor = args.get<scalar>("scale", 1);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 914e98dfd0..464029faee 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const fileName kivaFileName = args.opt<fileName>("file", "otape17");
+    const fileName kivaFileName = args.get<fileName>("file", "otape17");
 
     kivaVersions kivaVersion = kiva3v;
     if (args.found("version"))
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    const scalar zHeadMin = args.opt<scalar>("zHeadMin", -GREAT);
+    const scalar zHeadMin = args.get<scalar>("zHeadMin", -GREAT);
 
     #include "readKivaGrid.H"
 
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index 760b8620aa..c657922211 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", 1);
+    const scalar scaleFactor = args.get<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 bacb1cb768..f334f67063 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
         prefix,
         runTime,
         // Default rescale from [mm] to [m]
-        args.opt<scalar>("scale", 0.001),
+        args.get<scalar>("scale", 0.001),
         args.found("solids")
     );
 
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index ab1176ae24..6c647b2938 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -468,19 +468,19 @@ int main(int argc, char *argv[])
             }
             if (doCell)
             {
-                const label celli = args.opt<label>("cell");
+                const label celli = args.get<label>("cell");
 
                 writePoints(mesh, celli, runTime.timeName());
             }
             if (doPoint)
             {
-                const label pointi = args.opt<label>("point");
+                const label pointi = args.get<label>("point");
 
                 writePointCells(mesh, pointi, runTime.timeName());
             }
             if (doFace)
             {
-                const label facei = args.opt<label>("face");
+                const label facei = args.get<label>("face");
 
                 fileName fName
                 (
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index ee6dd69968..192f87536e 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE
             ),
-            args.opt<fileName>("dict", "")
+            args.get<fileName>("dict", "")
         )
     );
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index 7dcb4383df..94e9db0457 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 
     // Allow override of decomposeParDict location
     const fileName decompDictFile =
-        args.opt<fileName>("decomposeParDict", "");
+        args.get<fileName>("decomposeParDict", "");
 
     IOdictionary foamyHexMeshDict
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index 41e7ad27ca..34632d6dc1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -64,7 +64,7 @@ scalar getMergeDistance
     const boundBox& bb
 )
 {
-    const scalar mergeTol = args.opt<scalar>("mergeTol", defaultMergeTol);
+    const scalar mergeTol = args.get<scalar>("mergeTol", defaultMergeTol);
 
     scalar writeTol =
         Foam::pow(scalar(10), -scalar(IOstream::defaultPrecision()));
@@ -522,7 +522,7 @@ int main(int argc, char *argv[])
 
         // Allow override of decomposeParDict location
         const fileName decompDictFile =
-            args.opt<fileName>("decomposeParDict", "");
+            args.get<fileName>("decomposeParDict", "");
 
         labelList decomp = decompositionModel::New
         (
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 16e9e51a3f..ab3f946896 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -885,7 +885,7 @@ int main(int argc, char *argv[])
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE
                 ),
-                args.opt<fileName>("decomposeParDict", "")
+                args.get<fileName>("decomposeParDict", "")
             )
         );
 
@@ -1962,7 +1962,7 @@ int main(int argc, char *argv[])
 
         fileName outFileName
         (
-            args.opt<fileName>
+            args.get<fileName>
             (
                 "outFile",
                 "constant/triSurface/simplifiedSurface.stl"
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 7a1856c097..5c0c64747c 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
     const bool allTopology = args.found("allTopology");
     const bool meshQuality = args.found("meshQuality");
 
-    const word surfaceFormat = args.opt<word>("writeSets", "");
+    const word surfaceFormat = args.get<word>("writeSets", "");
     const bool writeSets = surfaceFormat.size();
 
     wordHashSet selectedFields;
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 37f3987f71..b1fccfc255 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -534,7 +534,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     const word meshRegionName =
-        args.opt<word>("region", polyMesh::defaultRegion);
+        args.get<word>("region", polyMesh::defaultRegion);
 
     const bool overwrite = args.found("overwrite");
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 422e4b18c6..936aae9ac9 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -106,10 +106,10 @@ int main(int argc, char *argv[])
     fileName addCase = args[2];
 
     const word masterRegion =
-        args.opt<word>("masterRegion", polyMesh::defaultRegion);
+        args.get<word>("masterRegion", polyMesh::defaultRegion);
 
     const word addRegion =
-        args.opt<word>("addRegion", polyMesh::defaultRegion);
+        args.get<word>("addRegion", polyMesh::defaultRegion);
 
     // Since we don't use argList processor directory detection, add it to
     // the casename ourselves so it triggers the logic inside TimePath.
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 6c89e9ed7e..c5a1d9713e 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
         const word dictName("refineMeshDict");
 
         // Obtain dictPath here for messages
-        fileName dictPath = args.opt<fileName>("dict", "");
+        fileName dictPath = args.get<fileName>("dict", "");
 
         IOobject dictIO = IOobject::selectIO
         (
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 42bc58d873..1f429e7777 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -1952,7 +1952,7 @@ int main(int argc, char *argv[])
 
         if (insidePoint)
         {
-            const point insidePoint = args.opt<point>("insidePoint");
+            const point insidePoint = args.get<point>("insidePoint");
 
             label regionI = -1;
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index f2b998b05c..0450f33c5e 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -477,7 +477,7 @@ int main(int argc, char *argv[])
     else if (args.found("patch"))
     {
         exposedPatchIDs.first() =
-            getExposedPatchId(mesh, args.opt<word>("patch"));
+            getExposedPatchId(mesh, args.get<word>("patch"));
     }
     else
     {
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 88a72233df..389024a517 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            scalar timeValue = args.opt<scalar>("time");
+            scalar timeValue = args.get<scalar>("time");
             runTime.setTime(instant(timeValue), 0);
         }
     }
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 0eda0727ce..e77ea9307e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -330,7 +330,7 @@ int main(int argc, char *argv[])
 
 
     // Allow override of decomposeParDict location
-    const fileName decompDictFile = args.opt<fileName>("decomposeParDict", "");
+    const fileName decompDictFile = args.get<fileName>("decomposeParDict", "");
 
     // Get all region names
     wordList regionNames;
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
     else
     {
         regionNames.resize(1);
-        regionNames.first() = args.opt<word>("region", fvMesh::defaultRegion);
+        regionNames.first() = args.get<word>("region", fvMesh::defaultRegion);
     }
 
     forAll(regionNames, regioni)
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index b28887e6d4..e3f8eae58b 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -509,7 +509,7 @@ int main(int argc, char *argv[])
         Info<< "Operating on region " << regionName << nl << endl;
     }
 
-    const scalar mergeTol = args.opt<scalar>("mergeTol", defaultMergeTol);
+    const scalar mergeTol = args.get<scalar>("mergeTol", defaultMergeTol);
 
     scalar writeTol = Foam::pow(10.0, -scalar(IOstream::defaultPrecision()));
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 4eff8e749d..2048609ed3 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -117,7 +117,7 @@ scalar getMergeDistance
     const boundBox& bb
 )
 {
-    const scalar mergeTol = args.opt<scalar>("mergeTol", defaultMergeTol);
+    const scalar mergeTol = args.get<scalar>("mergeTol", defaultMergeTol);
 
     const scalar writeTol =
         Foam::pow(scalar(10), -scalar(IOstream::defaultPrecision()));
@@ -2496,7 +2496,7 @@ int main(int argc, char *argv[])
 
 
     // Allow override of decomposeParDict location
-    const fileName decompDictFile = args.opt<fileName>("decomposeParDict", "");
+    const fileName decompDictFile = args.get<fileName>("decomposeParDict", "");
 
     // Get all region names
     wordList regionNames;
@@ -2510,7 +2510,7 @@ int main(int argc, char *argv[])
     else
     {
         regionNames.resize(1);
-        regionNames.first() = args.opt<word>("region", fvMesh::defaultRegion);
+        regionNames.first() = args.get<word>("region", fvMesh::defaultRegion);
     }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index ea2902e316..c440c35825 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])
     ensightCase::options caseOpts(format);
 
     caseOpts.nodeValues(args.found("nodeValues"));
-    caseOpts.width(args.opt<label>("width", 8));
+    caseOpts.width(args.get<label>("width", 8));
     caseOpts.overwrite(true); // remove existing output directory
 
     // Can also have separate directory for lagrangian
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
     // Define sub-directory name to use for EnSight data.
     // The path to the ensight directory is at case level only
     // - For parallel cases, data only written from master
-    fileName outputDir = args.opt<word>("name", "EnSight");
+    fileName outputDir = args.get<word>("name", "EnSight");
     if (!outputDir.isAbsolute())
     {
         outputDir = args.globalPath()/outputDir;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index b761e526ea..4b221f3494 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
     //
     ensightCase::options caseOpts(format);
 
-    caseOpts.width(args.opt<label>("width", 8));
+    caseOpts.width(args.get<label>("width", 8));
     caseOpts.overwrite(false); // leave existing output directory
 
     // Can also have separate directory for lagrangian
@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
     // Define sub-directory name to use for EnSight data.
     // The path to the ensight directory is at case level only
     // - For parallel cases, data only written from master
-    fileName ensightDir = args.opt<word>("name", "Ensight");
+    fileName ensightDir = args.get<word>("name", "Ensight");
     if (!ensightDir.isAbsolute())
     {
         ensightDir = args.globalPath()/ensightDir;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 13e4afbb82..53fa844c86 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -637,7 +637,7 @@ int main(int argc, char *argv[])
     else
     {
         regionNames.resize(1);
-        regionNames.first() = args.opt<word>("region", fvMesh::defaultRegion);
+        regionNames.first() = args.get<word>("region", fvMesh::defaultRegion);
     }
 
 
@@ -699,7 +699,7 @@ int main(int argc, char *argv[])
     // Directory management
 
     // Sub-directory for output
-    const word vtkDirName = args.opt<word>("name", "VTK");
+    const word vtkDirName = args.get<word>("name", "VTK");
 
     const fileName outputDir(args.globalPath()/vtkDirName);
 
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C b/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
index 2d30c4293b..04618b0edf 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
@@ -93,10 +93,10 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const label maxOut = Foam::max(0, args.opt<label>("max", 0));
-    const label span   = Foam::max(1, args.opt<label>("span", 1));
+    const label maxOut = Foam::max(0, args.get<label>("max", 0));
+    const label span   = Foam::max(1, args.get<label>("span", 1));
 
-    const scalar relax = args.opt<scalar>("scale", 1);
+    const scalar relax = args.get<scalar>("scale", 1);
 
     const bool slave = args.found("slave");
     const bool removeLock = args.found("removeLock");
diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
index f8250435ab..185b153232 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
@@ -237,12 +237,12 @@ int main(int argc, char *argv[])
     }
 
 
-    const int divisions = args.opt<int>("divisions", 1);
+    const int divisions = args.get<int>("divisions", 1);
     Info<< "Using " << divisions << " per time interval" << nl << endl;
 
 
     const word interpolationType =
-        args.opt<word>("interpolationType", "linear");
+        args.get<word>("interpolationType", "linear");
 
     Info<< "Using interpolation " << interpolationType << nl << endl;
 
diff --git a/applications/utilities/postProcessing/postProcess/postProcess.C b/applications/utilities/postProcessing/postProcess/postProcess.C
index 4795f05418..d2d03fcb81 100644
--- a/applications/utilities/postProcessing/postProcess/postProcess.C
+++ b/applications/utilities/postProcessing/postProcess/postProcess.C
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
     }
     if (args.found("field"))
     {
-        fields.resetFieldFilters(args.opt<wordRe>("field"));
+        fields.resetFieldFilters(args.get<wordRe>("field"));
     }
 
     // Externally stored dictionary for functionObjectList
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
index ff71571883..b5ca41b69e 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
@@ -64,12 +64,12 @@ dimensionedScalar ybl("ybl", dimLength, Zero);
 if (args.found("ybl"))
 {
     // If the boundary-layer thickness is provided use it
-    ybl.value() = args.opt<scalar>("ybl");
+    ybl.value() = args.get<scalar>("ybl");
 }
 else if (args.found("Cbl"))
 {
     // Calculate boundary layer thickness as Cbl*mean distance to wall
-    ybl.value() = gAverage(y)*args.opt<scalar>("Cbl");
+    ybl.value() = gAverage(y)*args.get<scalar>("Cbl");
 }
 
 Info<< "\nCreating boundary-layer for U of thickness "
diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
index 1f5a3d3de3..b17b830497 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
 
     fileName baseDir
     (
-        args.opt<fileName>
+        args.get<fileName>
         (
             "templateDir",
             "${WM_PROJECT_DIR}/etc/caseDicts/createZeroDirectoryTemplates"
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index 20cc58bad8..1ffe28cae3 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -434,7 +434,7 @@ int main(int argc, char *argv[])
     }
     const bool enableEntries = args.found("enableFunctionEntries");
 
-    const word regionName = args.opt<word>("region", polyMesh::defaultRegion);
+    const word regionName = args.get<word>("region", polyMesh::defaultRegion);
 
     fileName regionPrefix;
     if (regionName != polyMesh::defaultRegion)
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 8df774b9c4..1216b0fbaa 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -69,7 +69,7 @@ int readNumProcs
                     IOobject::NO_WRITE,
                     false // do not register
                 ),
-                args.opt<fileName>(optionName, "")
+                args.get<fileName>(optionName, "")
             )
         )
     );
diff --git a/applications/utilities/preProcessing/mapFields/setTimeIndex.H b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
index d84c85028a..653bcf27e2 100644
--- a/applications/utilities/preProcessing/mapFields/setTimeIndex.H
+++ b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
@@ -11,7 +11,7 @@
             sourceTimeIndex = Time::findClosestTimeIndex
             (
                 sourceTimes,
-                args.opt<scalar>("sourceTime")
+                args.get<scalar>("sourceTime")
             );
         }
     }
diff --git a/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H b/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H
index 35b2cdc49e..4304b72b01 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H
@@ -20,7 +20,7 @@
             sourceTimeIndex = Time::findClosestTimeIndex
             (
                 sourceTimes,
-                args.opt<scalar>("sourceTime")
+                args.get<scalar>("sourceTime")
             );
         }
     }
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index b0c423d203..993d84d49c 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
     const bool addPoint     = args.found("points");
     const bool mergeRegions = args.found("mergeRegions");
 
-    const scalar scaleFactor = args.opt<scalar>("scale", -1);
+    const scalar scaleFactor = args.get<scalar>("scale", -1);
 
     if (addPoint)
     {
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 7c02bc9da5..c1278a58ec 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1596,7 +1596,7 @@ int main(int argc, char *argv[])
 
 
     // Scale factor for both surfaces:
-    const scalar scaleFactor = args.opt<scalar>("scale", -1);
+    const scalar scaleFactor = args.get<scalar>("scale", -1);
 
     const word surf1Name(args[2]);
     Info<< "Reading surface " << surf1Name << endl;
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 7c238e7936..0305a35635 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -338,8 +338,8 @@ int main(int argc, char *argv[])
     const fileName surfFileName = args[1];
     const bool checkSelfIntersect = args.found("checkSelfIntersection");
     const bool splitNonManifold = args.found("splitNonManifold");
-    const label outputThreshold = args.opt<label>("outputThreshold", 10);
-    const word surfaceFormat = args.opt<word>("writeSets", "");
+    const label outputThreshold = args.get<label>("outputThreshold", 10);
+    const word surfaceFormat = args.get<word>("writeSets", "");
     const bool writeSets = !surfaceFormat.empty();
 
     autoPtr<surfaceWriter> surfWriter;
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index d1fa28a26f..028054c231 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     triSurface surf
     (
         inFileName,
-        args.opt<scalar>("scale", -1)
+        args.get<scalar>("scale", -1)
     );
     surf.writeStats(Info);
 
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 851f12d76c..8938ae6dc3 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", -1);
+    const scalar scaleFactor = args.get<scalar>("scale", -1);
 
     Info<< "Input surface   :" << inFileName << nl
         << "Scaling factor  :" << scaleFactor << nl
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index 9c4b12b7f8..a09414d2a8 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    const scalar scaleFactor = args.opt<scalar>("scale", -1);
+    const scalar scaleFactor = args.get<scalar>("scale", -1);
 
     Info<< "Reading : " << importName << endl;
     triSurface surf(importName, scaleFactor);
diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C
index 5979d925ed..e9ace78a1c 100644
--- a/applications/utilities/surface/surfaceFind/surfaceFind.C
+++ b/applications/utilities/surface/surfaceFind/surfaceFind.C
@@ -63,9 +63,9 @@ int main(int argc, char *argv[])
 
     const point samplePt
     (
-        args.opt<scalar>("x", 0),
-        args.opt<scalar>("y", 0),
-        args.opt<scalar>("z", 0)
+        args.get<scalar>("x", 0),
+        args.get<scalar>("y", 0),
+        args.get<scalar>("z", 0)
     );
     Info<< "Looking for nearest face/vertex to " << samplePt << endl;
 
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 679149ff91..c0593f3041 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar density = args.opt<scalar>("density", 1);
+    const scalar density = args.get<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 85f4ca5468..58ee30a9af 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -612,8 +612,8 @@ int main(int argc, char *argv[])
     const scalar distance(args.get<scalar>(2));
     const scalar extendFactor(args.get<scalar>(3));
     const bool checkSelfIntersect = args.found("checkSelfIntersection");
-    const label nSmooth = args.opt<label>("nSmooth", 10);
-    const scalar featureAngle = args.opt<scalar>("featureAngle", 180);
+    const label nSmooth = args.get<label>("nSmooth", 10);
+    const scalar featureAngle = args.get<scalar>("featureAngle", 180);
     const bool debug = args.found("debug");
 
 
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 7172b5b605..5d8d32e232 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
                 IOobject::NO_WRITE,
                 false
             ),
-            args.opt<fileName>("dict", "")
+            args.get<fileName>("dict", "")
         );
 
         if (!ioCsys.typeHeaderOk<coordinateSystems>(false))
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 531e105769..f2c9091edd 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
     Time runTime(args.rootPath(), args.caseName());
 
     const fileName exportName = args[1];
-    const word importName = args.opt<word>("name", "default");
+    const word importName = args.get<word>("name", "default");
 
     // check that writing is supported
     if (!MeshedSurface<face>::canWriteType(exportName.ext(), true))
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
                 IOobject::NO_WRITE,
                 false
             ),
-            args.opt<fileName>("dict", "")
+            args.get<fileName>("dict", "")
         );
 
         if (!ioCsys.typeHeaderOk<coordinateSystems>(false))
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index cb80a98c58..7475f8244a 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
 
 
     const fileName importName = args[1];
-    const word exportName = args.opt<word>("name", "default");
+    const word exportName = args.get<word>("name", "default");
 
     // check that reading is supported
     if (!MeshedSurface<face>::canRead(importName, true))
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
                 IOobject::NO_WRITE,
                 false
             ),
-            args.opt<fileName>("dict", "")
+            args.get<fileName>("dict", "")
         );
 
         if (!ioCsys.typeHeaderOk<coordinateSystems>(false))
diff --git a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
index a8a9755035..be784b9f2c 100644
--- a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
+++ b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     // use UnsortedMeshedSurface, not MeshedSurface to maintain ordering
     UnsortedMeshedSurface<face> surf(importName);
 
-    const scalar scaling = args.opt<scalar>("scale", -1);
+    const scalar scaling = args.get<scalar>("scale", -1);
     if (scaling > 0)
     {
         DetailInfo << " -scale " << scaling << nl;
diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
index d66b01bc92..438aed66e5 100644
--- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C
+++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
         Info<< "outside" << endl;
     }
 
-    const scalar scaling = args.opt<scalar>("scale", -1);
+    const scalar scaling = args.get<scalar>("scale", -1);
     if (scaling > 0)
     {
         Info<< "Input scaling: " << scaling << nl;
diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
index 5624d7119d..ef3d80bb91 100644
--- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
+++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
     const scalar   mergeTol = args.get<scalar>(2);
     const fileName outFileName = args[3];
 
-    const scalar scaling = args.opt<scalar>("scale", -1);
+    const scalar scaling = args.get<scalar>("scale", -1);
 
     Info<< "Reading surface from " << surfFileName << " ..." << nl
         << "Merging points within " << mergeTol << " metre." << nl;
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 4ecee13479..38a772bdf6 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE
                 ),
-                args.opt<fileName>("decomposeParDict", "")
+                args.get<fileName>("decomposeParDict", "")
             )
         );
 
diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
index de704eb99a..659ed93f93 100644
--- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
+++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
             << " triangle ..." << endl;
     }
 
-    const scalar searchTol = args.opt<scalar>("tol", 1e-3);
+    const scalar searchTol = args.get<scalar>("tol", 1e-3);
 
     // Get search box. Anything not within this box will not be considered.
     const boundBox& meshBb = mesh.bounds();
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 01f38f61c2..7bb5a0f292 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -403,7 +403,7 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
 
     dictionary& functionsDict = controlDict.subDict("functions");
 
-    const word regionName = args.opt<word>("region", "");
+    const word regionName = args.get<word>("region", "");
 
     bool modifiedControlDict = false;
 
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 75af58a5b7..407315f093 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -364,16 +364,6 @@ public:
         //- Return non-const access to the command options
         inline HashTable<string>& options();
 
-        //- Get a value from the argument at index.
-        //  Index 1 is the first (non-option) argument.
-        template<class T>
-        inline T get(const label index) const;
-
-        //- Read a value from the argument at index.
-        //  Index 1 is the first (non-option) argument.
-        template<class T>
-        inline List<T> getList(const label index) const;
-
         //- Return true if the named option is found
         inline bool found(const word& optName) const;
 
@@ -386,15 +376,25 @@ public:
         //- Return an input stream from the named option
         inline ITstream lookup(const word& optName) const;
 
+        //- Get a value from the argument at index.
+        //  Index 1 is the first (non-option) argument.
+        template<class T>
+        inline T get(const label index) const;
+
+        //- Get a List of values from the argument at index.
+        //  Index 1 is the first (non-option) argument.
+        template<class T>
+        inline List<T> getList(const label index) const;
+
         //- Get a value from the named option
         //  The default template parameter is string (ie, no conversion).
         template<class T=string>
-        inline T opt(const word& optName) const;
+        inline T get(const word& optName) const;
 
         //- Get a value from the named option if present, or return default.
         //  Identical to getOrDefault().
         template<class T>
-        inline T opt(const word& optName, const T& deflt) const;
+        inline T get(const word& optName, const T& deflt) const;
 
         //- Read a value from the named option if present.
         //  \return true if the named option was found.
@@ -414,11 +414,7 @@ public:
 
         //- Get a value from the named option if present, or return default.
         template<class T>
-        inline T getOrDefault
-        (
-            const word& optName,
-            const T& deflt
-        ) const;
+        inline T getOrDefault(const word& optName, const T& deflt) const;
 
         //- Get a List of values from the named option,
         //- treating a single entry like a list of size 1.
@@ -435,6 +431,21 @@ public:
         inline bool readListIfPresent(const word& optName, List<T>& list) const;
 
 
+        //- Alternative name for option get(const word& optName)
+        template<class T=string>
+        T opt(const word& optName) const
+        {
+            return this->get<T>(optName);
+        }
+
+        //- Alternative name for option get(const word& optName, ...)
+        template<class T>
+        T opt(const word& optName, const T& deflt) const
+        {
+            return this->get<T>(optName, deflt);
+        }
+
+
     // Edit
 
         //- Append a (mandatory) argument to validArgs
@@ -650,12 +661,12 @@ public:
         }
 
         //- Deprecated(2018-01) read a value from the named option
-        //  \deprecated(2018-01) - use opt() method
+        //  \deprecated(2018-01) - use get() method
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-01, "opt() method")
+        T FOAM_DEPRECATED_FOR(2018-01, "get() method")
         optionRead(const word& optName) const
         {
-            return opt<T>(optName);
+            return get<T>(optName);
         }
 
         //- Deprecated(2018-01) read a value from the named option if present.
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index 55f9101afb..d3f5f53e04 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -191,22 +191,22 @@ namespace Foam
     }
 
 
-    template<> inline int32_t argList::opt<int32_t>(const word& optName) const
+    template<> inline int32_t argList::get<int32_t>(const word& optName) const
     {
         return Foam::readInt32(options_[optName]);
     }
 
-    template<> inline int64_t argList::opt<int64_t>(const word& optName) const
+    template<> inline int64_t argList::get<int64_t>(const word& optName) const
     {
         return Foam::readInt64(options_[optName]);
     }
 
-    template<> inline float argList::opt<float>(const word& optName) const
+    template<> inline float argList::get<float>(const word& optName) const
     {
         return Foam::readFloat(options_[optName]);
     }
 
-    template<> inline double argList::opt<double>(const word& optName) const
+    template<> inline double argList::get<double>(const word& optName) const
     {
         return Foam::readDouble(options_[optName]);
     }
@@ -232,19 +232,19 @@ namespace Foam
 
 
     template<>
-    inline string argList::opt<Foam::string>(const word& optName) const
+    inline string argList::get<Foam::string>(const word& optName) const
     {
         return options_[optName];
     }
 
     template<>
-    inline word argList::opt<Foam::word>(const word& optName) const
+    inline word argList::get<Foam::word>(const word& optName) const
     {
         return options_[optName];
     }
 
     template<>
-    inline fileName argList::opt<Foam::fileName>(const word& optName) const
+    inline fileName argList::get<Foam::fileName>(const word& optName) const
     {
         return options_[optName];
     }
@@ -268,7 +268,7 @@ inline T Foam::argList::get(const label index) const
 
 
 template<class T>
-inline T Foam::argList::opt(const word& optName) const
+inline T Foam::argList::get(const word& optName) const
 {
     ITstream is(optName, options_[optName]);
 
@@ -282,11 +282,11 @@ inline T Foam::argList::opt(const word& optName) const
 
 
 template<class T>
-inline T Foam::argList::opt(const word& optName, const T& deflt) const
+inline T Foam::argList::get(const word& optName, const T& deflt) const
 {
     if (found(optName))
     {
-        return opt<T>(optName);
+        return get<T>(optName);
     }
 
     return deflt;
@@ -302,7 +302,7 @@ inline bool Foam::argList::readIfPresent
 {
     if (found(optName))
     {
-        val = opt<T>(optName);
+        val = get<T>(optName);
         return true;
     }
 
@@ -337,7 +337,7 @@ inline T Foam::argList::getOrDefault
 {
     if (found(optName))
     {
-        return opt<T>(optName);
+        return get<T>(optName);
     }
 
     return deflt;
diff --git a/src/OpenFOAM/include/checkTimeOption.H b/src/OpenFOAM/include/checkTimeOption.H
index 97327c5339..244eccb979 100644
--- a/src/OpenFOAM/include/checkTimeOption.H
+++ b/src/OpenFOAM/include/checkTimeOption.H
@@ -2,7 +2,7 @@
 
 if (args.found("time"))
 {
-    Foam::scalar timeValue = args.opt<scalar>("time");
+    Foam::scalar timeValue = args.get<scalar>("time");
 
     startTime = Foam::Time::findClosestTimeIndex(Times, timeValue);
 }
diff --git a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
index 4174f54f4f..0ea2f3397d 100644
--- a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
@@ -8,5 +8,5 @@ IOobject dictIO = IOobject::selectIO
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     ),
-    args.opt<fileName>("dict", "")
+    args.get<fileName>("dict", "")
 );
diff --git a/src/OpenFOAM/include/setConstantRunTimeDictionaryIO.H b/src/OpenFOAM/include/setConstantRunTimeDictionaryIO.H
index ce1b8dd1dc..a42b433ffe 100644
--- a/src/OpenFOAM/include/setConstantRunTimeDictionaryIO.H
+++ b/src/OpenFOAM/include/setConstantRunTimeDictionaryIO.H
@@ -8,5 +8,5 @@ IOobject dictIO = IOobject::selectIO
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     ),
-    args.opt<fileName>("dict", "")
+    args.get<fileName>("dict", "")
 );
diff --git a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
index 33ea27f46a..6cd54c20a2 100644
--- a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
@@ -8,5 +8,5 @@ IOobject dictIO = IOobject::selectIO
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     ),
-    args.opt<fileName>("dict", "")
+    args.get<fileName>("dict", "")
 );
diff --git a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
index 0be3e435ec..05b5ed4d7b 100644
--- a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
@@ -8,5 +8,5 @@ IOobject dictIO = IOobject::selectIO
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     ),
-    args.opt<fileName>("dict", "")
+    args.get<fileName>("dict", "")
 );