Skip to content
Snippets Groups Projects
Commit a6f524b1 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

STYLE: -diff-etc instead of -diffEtc in foamDictionary

parent b393c60d
Branches
Tags
No related merge requests found
...@@ -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 -diffEtc \<dictionary\> - \par -diff-etc \<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 -diffEtc templates/closedVolume/0/U foamDictionary 0/U -diff-etc 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 -diffEtc templates/closedVolume/0/U \ foamDictionary 0/U -diff-etc 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
( (
"diffEtc", "diff-etc",
"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 "diffEtc" // Has "diff" or "diff-etc"
bool optDiff = false; bool optDiff = false;
// Reference dictionary for -diff / -diffEtc // Reference dictionary for -diff / -diff-etc
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("diffEtc", diffFileName)) else if (args.readIfPresent("diff-etc", diffFileName))
{ {
fileName foundName = findEtcFile(diffFileName); fileName foundName = findEtcFile(diffFileName);
if (foundName.empty()) if (foundName.empty())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment