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

STYLE: use explicit dictionary access for dictionaryEntry

Browse Source 
- clarifies the meanings of get<T> etc, avoids later ambiguities.

ENH: simplify phaseProperties construction, add input checks
This commit is contained in:
Mark Olesen
2018-10-16 09:58:49 +02:00
parent 7864672c78
commit 873b2f0a9f
9 changed files with 63 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
View File

@ -62,19 +62,20 @@ Foam::Istream& Foam::functionObjects::operator>>
{
is.check(FUNCTION_NAME);
const dictionaryEntry entry(dictionary::null, is);
const dictionaryEntry dictEntry(dictionary::null, is);
const dictionary& dict = dictEntry.dict();
faItem.active_ = false;
faItem.fieldName_ = entry.keyword();
faItem.mean_ = entry.get<bool>("mean");
faItem.prime2Mean_ = entry.get<bool>("prime2Mean");
faItem.base_ = faItem.baseTypeNames_.lookup("base", entry);
faItem.window_ = entry.lookupOrDefault<scalar>("window", -1.0);
faItem.fieldName_ = dictEntry.keyword();
faItem.mean_ = dict.get<bool>("mean");
faItem.prime2Mean_ = dict.get<bool>("prime2Mean");
faItem.base_ = faItem.baseTypeNames_.lookup("base", dict);
faItem.window_ = dict.lookupOrDefault<scalar>("window", -1.0);
if (faItem.window_ > 0)
{
faItem.windowType_ =
faItem.windowTypeNames_.lookup("windowType", entry);
faItem.windowTypeNames_.lookup("windowType", dict);
if (faItem.windowType_ != fieldAverageItem::windowType::NONE)
{
@ -84,17 +85,17 @@ Foam::Istream& Foam::functionObjects::operator>>
&& label(faItem.window_) < 1
)
{
FatalIOErrorInFunction(entry)
FatalIOErrorInFunction(dictEntry)
<< "Window must be 1 or more for base type "
<< faItem.baseTypeNames_[fieldAverageItem::baseType::ITER]
<< exit(FatalIOError);
}
faItem.windowName_ = entry.lookupOrDefault<word>("windowName", "");
faItem.windowName_ = dict.lookupOrDefault<word>("windowName", "");
if (faItem.windowType_ == fieldAverageItem::windowType::EXACT)
{
faItem.allowRestart_ = entry.get<bool>("allowRestart");
faItem.allowRestart_ = dict.get<bool>("allowRestart");
if (!faItem.allowRestart_)
{