Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
a6f524b1
Commit
a6f524b1
authored
7 years ago
by
Mark OLESEN
Browse files
Options
Downloads
Patches
Plain Diff
STYLE: -diff-etc instead of -diffEtc in foamDictionary
parent
b393c60d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+12
-12
12 additions, 12 deletions
...s/utilities/miscellaneous/foamDictionary/foamDictionary.C
with
12 additions
and
12 deletions
applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+
12
−
12
View file @
a6f524b1
...
@@ -50,7 +50,7 @@ Usage
...
@@ -50,7 +50,7 @@ Usage
Write differences with respect to the specified dictionary
Write differences with respect to the specified dictionary
(or sub entry if -entry specified)
(or sub entry if -entry specified)
- \par -diff
E
tc \<dictionary\>
- \par -diff
-e
tc \<dictionary\>
Write differences with respect to the specified dictionary
Write differences with respect to the specified dictionary
(or sub entry if -entry specified)
(or sub entry if -entry specified)
...
@@ -94,13 +94,13 @@ Usage
...
@@ -94,13 +94,13 @@ Usage
- Write the differences with respect to a template dictionary:
- Write the differences with respect to a template dictionary:
\verbatim
\verbatim
foamDictionary 0/U -diff
E
tc templates/closedVolume/0/U
foamDictionary 0/U -diff
-e
tc templates/closedVolume/0/U
\endverbatim
\endverbatim
- Write the differences in boundaryField with respect to a
- Write the differences in boundaryField with respect to a
template dictionary:
template dictionary:
\verbatim
\verbatim
foamDictionary 0/U -diff
E
tc templates/closedVolume/0/U \
foamDictionary 0/U -diff
-e
tc templates/closedVolume/0/U \
-entry boundaryField
-entry boundaryField
\endverbatim
\endverbatim
...
@@ -217,11 +217,9 @@ const dictionary& lookupScopedDict
...
@@ -217,11 +217,9 @@ const dictionary& lookupScopedDict
if
(
!
eptr
||
!
eptr
->
isDict
())
if
(
!
eptr
||
!
eptr
->
isDict
())
{
{
FatalIOErrorInFunction
(
dict
)
FatalIOErrorInFunction
(
dict
)
<<
"keyword "
<<
subDictName
<<
"'"
<<
subDictName
<<
"' not found in dictionary "
<<
" is undefined in dictionary "
<<
dict
.
name
()
<<
" or is not a dictionary"
<<
nl
<<
dict
.
name
()
<<
" or is not a dictionary"
<<
"Known entries are "
<<
dict
.
keys
()
<<
endl
<<
"Valid keywords are "
<<
dict
.
keys
()
<<
exit
(
FatalIOError
);
<<
exit
(
FatalIOError
);
}
}
...
@@ -300,10 +298,12 @@ int main(int argc, char *argv[])
...
@@ -300,10 +298,12 @@ int main(int argc, char *argv[])
);
);
argList
::
addOption
argList
::
addOption
(
(
"diff
E
tc"
,
"diff
-e
tc"
,
"dict"
,
"dict"
,
"As per -diff, but locate the file as per foamEtcFile"
"As per -diff, but locate the file as per foamEtcFile"
);
);
argList
::
addOptionCompat
(
"diff-etc"
,
{
"diffEtc"
,
1712
});
argList
::
addBoolOption
argList
::
addBoolOption
(
(
"includes"
,
"includes"
,
...
@@ -371,10 +371,10 @@ int main(int argc, char *argv[])
...
@@ -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
;
bool
optDiff
=
false
;
// Reference dictionary for -diff / -diff
E
tc
// Reference dictionary for -diff / -diff
-e
tc
dictionary
diffDict
;
dictionary
diffDict
;
{
{
fileName
diffFileName
;
fileName
diffFileName
;
...
@@ -392,7 +392,7 @@ int main(int argc, char *argv[])
...
@@ -392,7 +392,7 @@ int main(int argc, char *argv[])
diffDict
.
read
(
diffFile
,
true
);
diffDict
.
read
(
diffFile
,
true
);
optDiff
=
true
;
optDiff
=
true
;
}
}
else
if
(
args
.
readIfPresent
(
"diff
E
tc"
,
diffFileName
))
else
if
(
args
.
readIfPresent
(
"diff
-e
tc"
,
diffFileName
))
{
{
fileName
foundName
=
findEtcFile
(
diffFileName
);
fileName
foundName
=
findEtcFile
(
diffFileName
);
if
(
foundName
.
empty
())
if
(
foundName
.
empty
())
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment