Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
f721b534
Commit
f721b534
authored
Jun 02, 2020
by
Mark OLESEN
Browse files
ENH: report dictionary name actually used (for -dict option)
parent
31b17221
Changes
26
Hide whitespace changes
Inline
Side-by-side
applications/test/PDRblockMesh/Test-PDRblockMesh.C
View file @
f721b534
...
...
@@ -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 "
<<
dict
N
ame
<<
nl
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
meshDict
(
dictIO
);
...
...
applications/test/surfaceIntersection/Test-surfaceIntersection.C
View file @
f721b534
...
...
@@ -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
(
"
t
est intersect of two surfaces. Writes obj file"
"
T
est intersect of two surfaces. Writes obj file"
);
argList
::
noParallel
();
argList
::
noFunctionObjects
();
...
...
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View file @
f721b534
...
...
@@ -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 a
lternative collapseDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative collapseDict"
);
#include
"addOverwriteOption.H"
...
...
@@ -102,7 +103,7 @@ int main(int argc, char *argv[])
const
word
dictName
(
"collapseDict"
);
#include
"setSystemMeshDictionaryIO.H"
Info
<<
"Reading "
<<
dict
N
ame
<<
nl
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
collapseDict
(
dictIO
);
...
...
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View file @
f721b534
...
...
@@ -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 a
lternative modifyMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative modifyMeshDict"
);
argList
::
noFunctionObjects
();
// Never use function objects
...
...
applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C
View file @
f721b534
...
...
@@ -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"
,
...
...
applications/utilities/mesh/generation/blockMesh/blockMesh.C
View file @
f721b534
...
...
@@ -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"
,
...
...
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
View file @
f721b534
...
...
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
);
#include
"addRegionOption.H"
argList
::
addOption
(
"dict"
,
"file"
,
"
Use a
lternative extrudeMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative extrudeMeshDict"
);
#include
"setRootCase.H"
#include
"createTimeExtruded.H"
...
...
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View file @
f721b534
...
...
@@ -1428,7 +1428,7 @@ int main(int argc, char *argv[])
argList
::
addOption
(
"dict"
,
"file"
,
"
Use a
lternative extrudeToRegionMeshDict"
"dict"
,
"file"
,
"
A
lternative extrudeToRegionMeshDict"
);
#include
"setRootCase.H"
...
...
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View file @
f721b534
...
...
@@ -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 a
lternative snappyHexMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative snappyHexMeshDict"
);
argList
::
noFunctionObjects
();
// Never use function objects
...
...
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View file @
f721b534
...
...
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-20
18
OpenCFD Ltd.
Copyright (C) 2016-20
20
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 a
lternative createBafflesDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative 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 "
<<
dict
N
ame
<<
nl
<<
endl
;
Info
<<
"Reading baffle criteria from "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
dict
(
dictIO
);
internalFacesOnly
=
dict
.
get
<
bool
>
(
"internalFacesOnly"
);
...
...
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View file @
f721b534
...
...
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
#include
"addOverwriteOption.H"
#include
"addRegionOption.H"
argList
::
addOption
(
"dict"
,
"file"
,
"
Use a
lternative createPatchDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative createPatchDict"
);
argList
::
addBoolOption
(
"writeObj"
,
...
...
applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
View file @
f721b534
...
...
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-20
18
OpenCFD Ltd.
Copyright (C) 2016-20
20
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 "
<<
dict
N
ame
<<
"
\n
"
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
dict
(
dictIO
);
if
(
dict
.
found
(
"detect"
))
...
...
applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
View file @
f721b534
...
...
@@ -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 a
lternative mirrorMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative mirrorMeshDict"
);
argList
::
setAdvanced
(
"decomposeParDict"
);
#include
"addOverwriteOption.H"
...
...
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
#include
"setSystemRunTimeDictionaryIO.H"
Info
<<
"Reading "
<<
dict
N
ame
<<
"
\n
"
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
const
IOdictionary
mirrorDict
(
dictIO
);
...
...
applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
View file @
f721b534
...
...
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
#include
"addOverwriteOption.H"
#include
"addRegionOption.H"
argList
::
addOption
(
"dict"
,
"file"
,
"
Use a
lternative refineMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative refineMeshDict"
);
argList
::
addBoolOption
(
...
...
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View file @
f721b534
...
...
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-20
19
OpenCFD Ltd.
Copyright (C) 2016-20
20
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 a
lternative renumberMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative renumberMeshDict"
);
argList
::
addBoolOption
(
...
...
@@ -707,7 +707,7 @@ int main(int argc, char *argv[])
const
word
dictName
(
"renumberMeshDict"
);
#include
"setSystemMeshDictionaryIO.H"
Info
<<
"Renumber according to "
<<
dict
N
ame
<<
nl
<<
endl
;
Info
<<
"Renumber according to "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
renumberDictPtr
.
reset
(
new
IOdictionary
(
dictIO
));
const
IOdictionary
&
renumberDict
=
renumberDictPtr
();
...
...
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View file @
f721b534
...
...
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
#include
"addOverwriteOption.H"
#include
"addRegionOption.H"
argList
::
addOption
(
"dict"
,
"file"
,
"
Use a
lternative stitchMeshDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative stitchMeshDict"
);
argList
::
addBoolOption
(
...
...
@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
#include
"setSystemRunTimeDictionaryIO.H"
Info
<<
"Reading "
<<
dict
Name
;
Info
<<
"Reading "
<<
dict
IO
.
name
()
<<
flush
;
IOdictionary
stitchDict
(
dictIO
);
...
...
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View file @
f721b534
...
...
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
timeSelector
::
addOptions
(
true
,
false
);
// constant(true), zero(false)
argList
::
addOption
(
"dict"
,
"file"
,
"
Use a
lternative topoSetDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative 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 "
<<
dict
N
ame
<<
nl
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
topoSetDict
(
dictIO
);
...
...
applications/utilities/postProcessing/noise/noise.C
View file @
f721b534
...
...
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2016-20
17
OpenCFD Ltd.
Copyright (C) 2016-20
20
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 a
lternative noiseDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative 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 "
<<
dict
N
ame
<<
"
\n
"
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
dict
(
dictIO
);
...
...
applications/utilities/preProcessing/PDRsetFields/PDRsetFields.C
View file @
f721b534
...
...
@@ -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 a
lternative PDRsetFieldsDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative PDRsetFieldsDict"
);
argList
::
addBoolOption
(
...
...
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
const
word
dictName
(
"PDRsetFieldsDict"
);
#include
"setSystemRunTimeDictionaryIO.H"
Info
<<
"Reading "
<<
dict
N
ame
<<
"
\n
"
<<
endl
;
Info
<<
"Reading "
<<
dict
IO
.
n
ame
()
<<
nl
<<
endl
;
IOdictionary
setFieldsDict
(
dictIO
);
...
...
applications/utilities/preProcessing/changeDictionary/changeDictionary.C
View file @
f721b534
...
...
@@ -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 a
lternative changeDictionaryDict"
);
argList
::
addOption
(
"dict"
,
"file"
,
"
A
lternative changeDictionaryDict"
);
argList
::
addOption
(
...
...
Prev
1
2
Next
Mark OLESEN
@mark
mentioned in commit
6d965d69
·
Jul 01, 2020
mentioned in commit
6d965d69
mentioned in commit 6d965d699b2314034da0403adb913e6a5d446f7f
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment