From 7e466cfbd70006013d0931c874059ec242db10b5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Mon, 11 Jun 2018 14:31:36 +0100
Subject: [PATCH] foamDictionary, adiabaticFlameT, equilibriumFlameT: remove
 unused case related options

---
 .../miscellaneous/foamDictionary/foamDictionary.C     |  3 ++-
 .../thermophysical/adiabaticFlameT/adiabaticFlameT.C  |  6 +++---
 .../equilibriumFlameT/equilibriumFlameT.C             |  5 +++--
 src/OpenFOAM/global/argList/argList.C                 | 11 +++++++++++
 src/OpenFOAM/global/argList/argList.H                 |  8 ++++++--
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index 6af0c78d9..44e9b7fac 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -238,9 +238,10 @@ void remove(dictionary& dict, const dictionary& removeDict)
 
 int main(int argc, char *argv[])
 {
+    #include "removeCaseOptions.H"
+
     writeInfoHeader = false;
 
-    argList::removeOption("case");
     argList::addNote("manipulates dictionaries");
     argList::validArgs.append("dictionary file");
     argList::addBoolOption("keywords", "list keywords");
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 21a360e08..aa9c85c6f 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -31,11 +31,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
-#include "dictionary.H"
 #include "IFstream.H"
-#include "OSspecific.H"
 #include "etcFiles.H"
+#include "dimensionedTypes.H"
 
 #include "specie.H"
 #include "perfectGas.H"
@@ -52,6 +50,8 @@ typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
 
 int main(int argc, char *argv[])
 {
+    #include "removeCaseOptions.H"
+
     argList::validArgs.append("properties dictionary");
     argList args(argc, argv);
 
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 505970a3a..b33905dbe 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -32,12 +32,11 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "dictionary.H"
 #include "IFstream.H"
-#include "OSspecific.H"
 #include "etcFiles.H"
 #include "IOmanip.H"
+#include "dimensionedTypes.H"
 
 #include "specie.H"
 #include "perfectGas.H"
@@ -54,6 +53,8 @@ typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
 
 int main(int argc, char *argv[])
 {
+    #include "removeCaseOptions.H"
+
     argList::validArgs.append("properties dictionary");
     argList args(argc, argv);
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 505f86020..6ff7fc788 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -90,6 +90,17 @@ Foam::argList::initValidTables::initValidTables()
 }
 
 
+void Foam::argList::initValidTables::clear()
+{
+    argList::removeOption("case");
+    argList::removeOption("parallel");
+    argList::removeOption("roots");
+    argList::removeOption("hostRoots");
+    argList::removeOption("noFunctionObjects");
+    argList::removeOption("fileHandler");
+}
+
+
 Foam::argList::initValidTables dummyInitValidTables;
 
 
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index eea7fcf54..fefadb690 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -174,14 +174,18 @@ public:
         //- Standard name for the post-processing option
         static word postProcessOptionName;
 
-        //! \cond internalClass
+        // Class to initialize options table
+        // with the standard case related options
         class initValidTables
         {
         public:
 
             initValidTables();
+
+            //- Clear the options table
+            //  for utilities which do not operate on files rather than cases
+            static void clear();
         };
-        //! \endcond
 
 
     // Constructors