Commit 5d9e278e authored by Mark OLESEN's avatar Mark OLESEN
Browse files

ENH: consolidate handling of mandatory/optional command arguments

- for some special cases we wish to mark command-line arguments as
  being optional, in order to do our own treatment. For example,
  when an arbitrary number of arguments should be allowed.

  Now tag this situation with argList::noMandatoryArgs().
  The argList::argsMandatory() query can then be used in any further
  logic, including the standard default argument checking.

- with the new default check, can consolidate the special-purpose

      "setRootCaseNonMandatoryArgs.H"

  into the regular

      "setRootCase.H"

- revert to a simple "setRootCase.H" and move all the listing related
  bits to a "setRootCaseLists.H" file. This leaves the information
  available for solvers, or whoever else wishes, without being
  introduced everywhere.

- add include guards and scoping to the listing files and rename to
  something less generic.

     listOptions.H -> setRootCaseListOptions.H
     listOutput.H  -> setRootCaseListOutput.H
parent 00ec58a1
......@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMeshNoClear.H"
#include "createControl.H"
......
......@@ -65,8 +65,7 @@ int main(int argc, char *argv[])
);
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
......
......@@ -65,8 +65,7 @@ int main(int argc, char *argv[])
"Overset Laplace equation solver for a scalar quantity."
);
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createNamedDynamicFvMesh.H"
......
......@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
"Execute functionObjects"
);
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createNamedDynamicFvMesh.H"
......
......@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
);
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
......
......@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
);
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
......
......@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
......@@ -77,8 +77,7 @@ int main(int argc, char *argv[])
" turbulence modelling."
);
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
......
......@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "createControl.H"
......
......@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
#define CREATE_MESH createEngineMesh.H
#include "postProcess.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createEngineTime.H"
#include "createEngineMesh.H"
#include "createControl.H"
......
......@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
......@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
#define NO_CONTROL
#include "postProcess.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createSingleCellMesh.H"
#include "createFields.H"
......
......@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
#define CREATE_MESH createEngineMesh.H
#include "postProcess.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createEngineTime.H"
#include "createEngineMesh.H"
#include "createControl.H"
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
......@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
......@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
......@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
......@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
#define NO_CONTROL
#include "postProcess.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "createFields.H"
......
......@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
......
......@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
#include "postProcess.H"
#include "addCheckCaseOptions.H"
#include "setRootCase.H"
#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment