diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index edd762a839..a0e33ad2ae 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -82,7 +82,8 @@ int main(int argc, char *argv[]) "Collapse faces that are in the supplied face set" ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative collapseDict"); + #include "addOverwriteOption.H" argList::noFunctionObjects(); // Never use function objects diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index 2c482069c7..5323f25a97 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -342,7 +342,7 @@ int main(int argc, char *argv[]) "For example, moving points, splitting/collapsing edges etc." ); #include "addOverwriteOption.H" - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative modifyMeshDict"); argList::noFunctionObjects(); // Never use function objects diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C index 9569e7a253..46108ce780 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C @@ -1469,7 +1469,12 @@ int main(int argc, char *argv[]) #include "addRegionOption.H" #include "addOverwriteOption.H" - #include "addDictOption.H" + + argList::addOption + ( + "dict", "file", "Use alternative extrudeToRegionMeshDict" + ); + #include "setRootCase.H" #include "createTime.H" #include "createNamedMesh.H" diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index 0656083505..ab355019c1 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -684,6 +684,7 @@ int main(int argc, char *argv[]) #include "addRegionOption.H" #include "addOverwriteOption.H" + #include "addProfilingOption.H" argList::addBoolOption ( "checkGeometry", @@ -707,8 +708,7 @@ int main(int argc, char *argv[]) "file", "Name of the file to save the simplified surface to" ); - #include "addProfilingOption.H" - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative snappyHexMeshDict"); argList::noFunctionObjects(); // Never use function objects diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C index dc2eda49c3..0bc75143f3 100644 --- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C +++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C @@ -441,9 +441,8 @@ int main(int argc, char *argv[]) "Does not duplicate points." ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative createBafflesDict"); #include "addOverwriteOption.H" - #include "addDictOption.H" #include "addRegionOption.H" argList::noFunctionObjects(); // Never use function objects diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C index d85cf460bd..d96c94fa71 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C +++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C @@ -518,7 +518,7 @@ int main(int argc, char *argv[]) #include "addOverwriteOption.H" #include "addRegionOption.H" - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative createPatchDict"); argList::addBoolOption ( "writeObj", diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C index 6e612cbae7..5f7efd8061 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C @@ -49,9 +49,7 @@ int main(int argc, char *argv[]) "Mirrors a mesh around a given plane." ); - #include "addDictOption.H" - // Adjust the help text - argList::addUsage("dict", "Specify alternative mirrorMeshDict"); + argList::addOption("dict", "file", "Use alternative mirrorMeshDict"); argList::setAdvanced("decomposeParDict"); #include "addOverwriteOption.H" diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C index 98f2bebe2c..fadffbdbbe 100644 --- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C +++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C @@ -162,7 +162,8 @@ int main(int argc, char *argv[]) #include "addOverwriteOption.H" #include "addRegionOption.H" - #include "addDictOption.H" + + argList::addOption("dict", "file", "Use alternative refineMeshDict"); argList::addBoolOption ( diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C index c23210e68b..a9770456e3 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C +++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C @@ -617,7 +617,8 @@ int main(int argc, char *argv[]) #include "addRegionOption.H" #include "addOverwriteOption.H" #include "addTimeOptions.H" - #include "addDictOption.H" + + argList::addOption("dict", "file", "Use alternative renumberMeshDict"); argList::addBoolOption ( diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C index 47f47e7341..bf254a87e6 100644 --- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C +++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C @@ -115,7 +115,8 @@ int main(int argc, char *argv[]) #include "addOverwriteOption.H" #include "addRegionOption.H" - #include "addDictOption.H" + + argList::addOption("dict", "file", "Use alternative stitchMeshDict"); argList::addBoolOption ( diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C index bda18339c4..785a3ae34e 100644 --- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C +++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C @@ -207,7 +207,9 @@ int main(int argc, char *argv[]) ); timeSelector::addOptions(true, false); // constant(true), zero(false) - #include "addDictOption.H" + + argList::addOption("dict", "file", "Use alternative topoSetDict"); + #include "addRegionOption.H" argList::addBoolOption ( diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C index 9f01b669c2..a0f239c8c3 100644 --- a/applications/utilities/postProcessing/noise/noise.C +++ b/applications/utilities/postProcessing/noise/noise.C @@ -109,7 +109,8 @@ int main(int argc, char *argv[]) argList::noCheckProcessorDirectories(); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative noiseDict"); + #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C index f767b62d9f..e448fca9c9 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C @@ -396,7 +396,8 @@ int main(int argc, char *argv[]) " (such as the patch type for fields and polyMesh/boundary files)." ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative changeDictionaryDict"); + argList::addOption ( "subDict", diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C index 2312e19d5f..dfb11117c2 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) ( "commsDir", "dir", - "Specify alternate communications directory (default is 'comms')" + "Specify communications directory (default is 'comms')" ); #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C index 62c2c2e2ee..ae63469ff6 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C +++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C @@ -59,8 +59,9 @@ int main(int argc, char *argv[]) " algorithm. Writes a map of fine to coarse grid." ); + argList::addOption("dict", "file", "Use alternative viewFactorsDict"); #include "addRegionOption.H" - #include "addDictOption.H" + #include "setRootCase.H" #include "createTime.H" #include "createNamedMesh.H" diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C index 01510ad72e..7fc5823714 100644 --- a/applications/utilities/preProcessing/setFields/setFields.C +++ b/applications/utilities/preProcessing/setFields/setFields.C @@ -401,7 +401,8 @@ int main(int argc, char *argv[]) "Set values on a selected set of cells/patch-faces via a dictionary" ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative setFieldsDict"); + #include "addRegionOption.H" #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C index 8f86b60246..a93e9f1b5b 100644 --- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C +++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C @@ -274,8 +274,7 @@ int main(int argc, char *argv[]) ); argList::noParallel(); argList::addArgument("hookTolerance", "The point merge tolerance"); - - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative surfaceHookUpDict"); #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C index b66a397f2b..dbce9c97eb 100644 --- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C +++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C @@ -100,7 +100,8 @@ int main(int argc, char *argv[]) "factor", "Geometry scaling factor on output" ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative coordinateSystems"); + argList::addOption ( "from", diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C index 8498eb124e..f0c40bb4a0 100644 --- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C +++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C @@ -107,7 +107,8 @@ int main(int argc, char *argv[]) "factor", "Geometry scaling factor on output - default is 1" ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative coordinateSystems"); + argList::addOption ( "from", diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C index eb8cb700a0..45596b9ec5 100644 --- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C +++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C @@ -49,7 +49,7 @@ Usage Specify a scaling factor when writing files. - \par -dict \ - Specify an alternative dictionary for constant/coordinateSystems. + Use alternative dictionary for constant/coordinateSystems. - \par -from \ Specify a coordinate system when reading files. @@ -107,7 +107,8 @@ int main(int argc, char *argv[]) "factor", "Geometry scaling factor on output - default is 1" ); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative coordinateSystems"); + argList::addOption ( "from", diff --git a/applications/utilities/surface/surfacePatch/surfacePatch.C b/applications/utilities/surface/surfacePatch/surfacePatch.C index a2b2169dd2..7885474b5d 100644 --- a/applications/utilities/surface/surfacePatch/surfacePatch.C +++ b/applications/utilities/surface/surfacePatch/surfacePatch.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) "Add patches (regions) to a surface with a user-selectable method" ); argList::noParallel(); - #include "addDictOption.H" + argList::addOption("dict", "file", "Use alternative surfacePatchDict"); #include "setRootCase.H" #include "createTime.H"