zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Olesen
2020-06-02 14:15:21 +02:00
parent 31b172217c
commit f721b5344f
26 changed files with 60 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -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);

2
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -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

9
applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C
View File

@ -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",

7
applications/utilities/mesh/generation/blockMesh/blockMesh.C
View File

@ -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",

2
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
View File

@ -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"

2
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -1428,7 +1428,7 @@ int main(int argc, char *argv[])
argList::addOption
(
"dict", "file", "Use alternative extrudeToRegionMeshDict"
"dict", "file", "Alternative extrudeToRegionMeshDict"
);
#include "setRootCase.H"

2
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -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
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View File

@ -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");

2
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View File

@ -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",

11
applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
View File

@ -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
applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
View File

@ -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);

2
applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
View File

@ -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
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -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();

4
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -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);

4
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -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);