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
a6f524b1
Commit
a6f524b1
authored
Jun 01, 2018
by
Mark OLESEN
Browse files
STYLE: -diff-etc instead of -diffEtc in foamDictionary
parent
b393c60d
Changes
1
Hide whitespace changes
Inline
Side-by-side
applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
View file @
a6f524b1
...
...
@@ -50,7 +50,7 @@ Usage
Write differences with respect to the specified dictionary
(or sub entry if -entry specified)
- \par -diff
E
tc \<dictionary\>
- \par -diff
-e
tc \<dictionary\>
Write differences with respect to the specified dictionary
(or sub entry if -entry specified)
...
...
@@ -94,13 +94,13 @@ Usage
- Write the differences with respect to a template dictionary:
\verbatim
foamDictionary 0/U -diff
E
tc templates/closedVolume/0/U
foamDictionary 0/U -diff
-e
tc templates/closedVolume/0/U
\endverbatim
- Write the differences in boundaryField with respect to a
template dictionary:
\verbatim
foamDictionary 0/U -diff
E
tc templates/closedVolume/0/U \
foamDictionary 0/U -diff
-e
tc templates/closedVolume/0/U \
-entry boundaryField
\endverbatim
...
...
@@ -217,11 +217,9 @@ const dictionary& lookupScopedDict
if
(
!
eptr
||
!
eptr
->
isDict
())
{
FatalIOErrorInFunction
(
dict
)
<<
"keyword "
<<
subDictName
<<
" is undefined in dictionary "
<<
dict
.
name
()
<<
" or is not a dictionary"
<<
endl
<<
"Valid keywords are "
<<
dict
.
keys
()
<<
"'"
<<
subDictName
<<
"' not found in dictionary "
<<
dict
.
name
()
<<
" or is not a dictionary"
<<
nl
<<
"Known entries are "
<<
dict
.
keys
()
<<
exit
(
FatalIOError
);
}
...
...
@@ -300,10 +298,12 @@ int main(int argc, char *argv[])
);
argList
::
addOption
(
"diff
E
tc"
,
"diff
-e
tc"
,
"dict"
,
"As per -diff, but locate the file as per foamEtcFile"
);
argList
::
addOptionCompat
(
"diff-etc"
,
{
"diffEtc"
,
1712
});
argList
::
addBoolOption
(
"includes"
,
...
...
@@ -371,10 +371,10 @@ int main(int argc, char *argv[])
}
// Has "diff" or "diff
E
tc"
// Has "diff" or "diff
-e
tc"
bool
optDiff
=
false
;
// Reference dictionary for -diff / -diff
E
tc
// Reference dictionary for -diff / -diff
-e
tc
dictionary
diffDict
;
{
fileName
diffFileName
;
...
...
@@ -392,7 +392,7 @@ int main(int argc, char *argv[])
diffDict
.
read
(
diffFile
,
true
);
optDiff
=
true
;
}
else
if
(
args
.
readIfPresent
(
"diff
E
tc"
,
diffFileName
))
else
if
(
args
.
readIfPresent
(
"diff
-e
tc"
,
diffFileName
))
{
fileName
foundName
=
findEtcFile
(
diffFileName
);
if
(
foundName
.
empty
())
...
...
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