Commit f721b534 authored by Mark Olesen's avatar Mark Olesen
Browse files

ENH: report dictionary name actually used (for -dict option)

parent 31b17221
......@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -42,12 +42,7 @@ int main(int argc, char *argv[])
{
argList::noParallel();
argList::noFunctionObjects();
argList::addOption
(
"dict",
"file",
"Alternative dictionary for the PDRblockMesh description"
);
argList::addOption("dict", "file", "Alternative PDRblockMeshDict");
#include "setRootCase.H"
#include "createTime.H"
......@@ -56,7 +51,7 @@ int main(int argc, char *argv[])
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName << nl << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary meshDict(dictIO);
......
......@@ -116,11 +116,16 @@ int main(int argc, char *argv[])
"geometry scaling factor"
);
#include "addDictOption.H"
argList::addOption
(
"dict",
"file",
"Dictionary of intersect options"
);
argList::addNote
(
"test intersect of two surfaces. Writes obj file"
"Test intersect of two surfaces. Writes obj file"
);
argList::noParallel();
argList::noFunctionObjects();
......
......@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -84,7 +85,7 @@ int main(int argc, char *argv[])
"Collapse faces that are in the supplied face set"
);
argList::addOption("dict", "file", "Use alternative collapseDict");
argList::addOption("dict", "file", "Alternative collapseDict");
#include "addOverwriteOption.H"
......@@ -102,7 +103,7 @@ int main(int argc, char *argv[])
const word dictName("collapseDict");
#include "setSystemMeshDictionaryIO.H"
Info<< "Reading " << dictName << nl << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary collapseDict(dictIO);
......
......@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
"For example, moving points, splitting/collapsing edges etc."
);
#include "addOverwriteOption.H"
argList::addOption("dict", "file", "Use alternative modifyMeshDict");
argList::addOption("dict", "file", "Alternative modifyMeshDict");
argList::noFunctionObjects(); // Never use function objects
......
......@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -95,12 +95,7 @@ int main(int argc, char *argv[])
"noClean",
"Do not remove any existing polyMesh/ directory or files"
);
argList::addOption
(
"dict",
"file",
"Alternative dictionary for the PDRblockMesh description"
);
argList::addOption("dict", "file", "Alternative PDRblockMeshDict");
argList::addOption
(
"time",
......
......@@ -134,12 +134,7 @@ int main(int argc, char *argv[])
"noClean",
"Do not remove any existing polyMesh/ directory or files"
);
argList::addOption
(
"dict",
"file",
"Alternative dictionary for the blockMesh description"
);
argList::addOption("dict", "file", "Alternative blockMeshDict");
argList::addBoolOption
(
"sets",
......
......@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
);
#include "addRegionOption.H"
argList::addOption("dict", "file", "Use alternative extrudeMeshDict");
argList::addOption("dict", "file", "Alternative extrudeMeshDict");
#include "setRootCase.H"
#include "createTimeExtruded.H"
......
......@@ -1428,7 +1428,7 @@ int main(int argc, char *argv[])
argList::addOption
(
"dict", "file", "Use alternative extrudeToRegionMeshDict"
"dict", "file", "Alternative extrudeToRegionMeshDict"
);
#include "setRootCase.H"
......
......@@ -779,7 +779,7 @@ int main(int argc, char *argv[])
"file",
"Name of the file to save the simplified surface to"
);
argList::addOption("dict", "file", "Use alternative snappyHexMeshDict");
argList::addOption("dict", "file", "Alternative snappyHexMeshDict");
argList::noFunctionObjects(); // Never use function objects
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-2018 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -444,7 +444,7 @@ int main(int argc, char *argv[])
"Does not duplicate points."
);
argList::addOption("dict", "file", "Use alternative createBafflesDict");
argList::addOption("dict", "file", "Alternative createBafflesDict");
#include "addOverwriteOption.H"
#include "addRegionOption.H"
......@@ -468,7 +468,7 @@ int main(int argc, char *argv[])
PtrList<faceSelection> selectors;
{
Info<< "Reading baffle criteria from " << dictName << nl << endl;
Info<< "Reading baffle criteria from " << dictIO.name() << nl << endl;
IOdictionary dict(dictIO);
internalFacesOnly = dict.get<bool>("internalFacesOnly");
......
......@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
#include "addOverwriteOption.H"
#include "addRegionOption.H"
argList::addOption("dict", "file", "Use alternative createPatchDict");
argList::addOption("dict", "file", "Alternative createPatchDict");
argList::addBoolOption
(
"writeObj",
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-2018 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -286,7 +286,12 @@ int main(int argc, char *argv[])
#include "addOverwriteOption.H"
#include "addRegionOption.H"
#include "addDictOption.H"
argList::addBoolOption
(
"dict",
"file",
"Specify a dictionary to read actions from"
);
argList::addBoolOption
(
"detectOnly",
......@@ -330,7 +335,7 @@ int main(int argc, char *argv[])
const word dictName;
#include "setSystemMeshDictionaryIO.H"
Info<< "Reading " << dictName << "\n" << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary dict(dictIO);
if (dict.found("detect"))
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
"Mirrors a mesh around a given plane."
);
argList::addOption("dict", "file", "Use alternative mirrorMeshDict");
argList::addOption("dict", "file", "Alternative mirrorMeshDict");
argList::setAdvanced("decomposeParDict");
#include "addOverwriteOption.H"
......@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName << "\n" << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
const IOdictionary mirrorDict(dictIO);
......
......@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
#include "addOverwriteOption.H"
#include "addRegionOption.H"
argList::addOption("dict", "file", "Use alternative refineMeshDict");
argList::addOption("dict", "file", "Alternative refineMeshDict");
argList::addBoolOption
(
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -618,7 +618,7 @@ int main(int argc, char *argv[])
#include "addOverwriteOption.H"
#include "addTimeOptions.H"
argList::addOption("dict", "file", "Use alternative renumberMeshDict");
argList::addOption("dict", "file", "Alternative renumberMeshDict");
argList::addBoolOption
(
......@@ -707,7 +707,7 @@ int main(int argc, char *argv[])
const word dictName("renumberMeshDict");
#include "setSystemMeshDictionaryIO.H"
Info<< "Renumber according to " << dictName << nl << endl;
Info<< "Renumber according to " << dictIO.name() << nl << endl;
renumberDictPtr.reset(new IOdictionary(dictIO));
const IOdictionary& renumberDict = renumberDictPtr();
......
......@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
#include "addOverwriteOption.H"
#include "addRegionOption.H"
argList::addOption("dict", "file", "Use alternative stitchMeshDict");
argList::addOption("dict", "file", "Alternative stitchMeshDict");
argList::addBoolOption
(
......@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName;
Info<< "Reading " << dictIO.name() << flush;
IOdictionary stitchDict(dictIO);
......
......@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
timeSelector::addOptions(true, false); // constant(true), zero(false)
argList::addOption("dict", "file", "Use alternative topoSetDict");
argList::addOption("dict", "file", "Alternative topoSetDict");
#include "addRegionOption.H"
argList::addBoolOption
......@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
const word dictName("topoSetDict");
#include "setSystemMeshDictionaryIO.H"
Info<< "Reading " << dictName << nl << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary topoSetDict(dictIO);
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2016-2017 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
argList::noCheckProcessorDirectories();
argList::addOption("dict", "file", "Use alternative noiseDict");
argList::addOption("dict", "file", "Alternative noiseDict");
#include "setRootCase.H"
#include "createTime.H"
......@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
const word dictName("noiseDict");
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName << "\n" << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary dict(dictIO);
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 Shell Research Ltd.
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
"Specify a time"
);
argList::addOption("dict", "file", "Use alternative PDRsetFieldsDict");
argList::addOption("dict", "file", "Alternative PDRsetFieldsDict");
argList::addBoolOption
(
......@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
const word dictName("PDRsetFieldsDict");
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName << "\n" << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary setFieldsDict(dictIO);
......
......@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
" (such as the patch type for fields and polyMesh/boundary files)."
);
argList::addOption("dict", "file", "Use alternative changeDictionaryDict");
argList::addOption("dict", "file", "Alternative changeDictionaryDict");
argList::addOption
(
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
" algorithm. Writes a map of fine to coarse grid."
);
argList::addOption("dict", "file", "Use alternative viewFactorsDict");
argList::addOption("dict", "file", "Alternative viewFactorsDict");
#include "addRegionOption.H"
#include "setRootCase.H"
......
......@@ -403,7 +403,7 @@ int main(int argc, char *argv[])
"Set values on a selected set of cells/patch-faces via a dictionary"
);
argList::addOption("dict", "file", "Use alternative setFieldsDict");
argList::addOption("dict", "file", "Alternative setFieldsDict");
#include "addRegionOption.H"
#include "setRootCase.H"
......@@ -413,7 +413,7 @@ int main(int argc, char *argv[])
const word dictName("setFieldsDict");
#include "setSystemMeshDictionaryIO.H"
Info<< "Reading " << dictName << "\n" << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
IOdictionary setFieldsDict(dictIO);
......
......@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
const word dictName("surfaceFeatureExtractDict");
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName << nl << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
const IOdictionary dict(dictIO);
// Loader for available triSurface surface files
......
......@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
);
argList::noParallel();
argList::addArgument("hookTolerance", "The point merge tolerance");
argList::addOption("dict", "file", "Use alternative surfaceHookUpDict");
argList::addOption("dict", "file", "Alternative surfaceHookUpDict");
#include "setRootCase.H"
#include "createTime.H"
......@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
const word dictName("surfaceHookUpDict");
#include "setSystemRunTimeDictionaryIO.H"
Info<< "Reading " << dictName << nl << endl;
Info<< "Reading " << dictIO.name() << nl << endl;
const IOdictionary dict(dictIO);
......
......@@ -55,7 +55,7 @@ Usage
Scale factor when writing files.
- \par -dict \<dictionary\>
Use alternative dictionary for constant/coordinateSystems.
Alternative dictionary for constant/coordinateSystems.
- \par -from \<coordinateSystem\>
Specify a coordinate system when reading files.
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2015 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
"Add patches (regions) to a surface with a user-selectable method"
);
argList::noParallel();
argList::addOption("dict", "file", "Use alternative surfacePatchDict");
argList::addOption("dict", "file", "Alternative surfacePatchDict");
#include "setRootCase.H"
#include "createTime.H"
......
Markdown is supported
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