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: rationalize expression string reading

Browse Source 
- read construct from dictionary.
  Calling syntax similar to dimensionedType, dimensionedSet,...

  Replaces the older getEntry(), getOptional() static methods

- support readIfPresent
This commit is contained in:
Mark Olesen
2022-09-28 09:24:46 +02:00
parent 3a6e427409
commit ee9119f436
25 changed files with 218 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFields.C
View File

@ -232,15 +232,7 @@ int main(int argc, char *argv[])
dictionary& patchDict = boundaryFieldDict.subDict(patchName);
auto valueExpr_
(
expressions::exprString::getEntry
(
"expression",
currDict,
true // strip comments
)
);
expressions::exprString valueExpr_("expression", currDict);
Info<< "Set boundaryField/" << patchName << '/'
<< targetName << nl

29
applications/utilities/preProcessing/setExprFields/setExprFields.C
View File

@ -560,7 +560,6 @@ int main(int argc, char *argv[])
" (command-line operation)",
true // Advanced option
);
argList::addOptionCompat("dimensions", {"dimension", 2012});
argList::addBoolOption
(
@ -771,11 +770,7 @@ int main(int argc, char *argv[])
ctrl.streamOpt.format(IOstreamOption::ASCII);
}
expressions::exprString valueExpr_
(
args["expression"],
dictionary::null
);
expressions::exprString valueExpr_(args["expression"]);
expressions::exprString maskExpr_;
args.readIfPresent("field-mask", maskExpr_);
@ -860,14 +855,7 @@ int main(int argc, char *argv[])
const word fieldName(dict.get<word>("field"));
auto valueExpr_
(
expressions::exprString::getEntry
(
"expression",
dict
)
);
expressions::exprString valueExpr_("expression", dict);
expressions::exprString maskExpr_;
{
@ -884,18 +872,11 @@ int main(int argc, char *argv[])
}
}
// Optional: "dimensions"
dimensionSet dims;
if (dims.readEntry("dimensions", dict, false))
{
const entry* dimPtr = dict.findCompat
(
"dimensions", {{"dimension", 2012}},
keyType::LITERAL
);
if (dimPtr)
{
dimPtr->stream() >> dims;
}
ctrl.hasDimensions = bool(dimPtr);
ctrl.hasDimensions = true;
}
if (args.verbose() && !timei)