ENH: adjustments to runTimePostProcessing

- support VTP input in functionObjectCloud scene element

- additional fallback lookup of cloud information from state properties
  instead of cloud OutputProperties
This commit is contained in:
Mark Olesen
2018-06-15 23:01:27 +02:00
parent c5518dd9ff
commit b30138595c
8 changed files with 134 additions and 76 deletions

View File

@ -44,11 +44,11 @@ namespace runTimePostPro
bool Foam::functionObjects::runTimePostPro::functionObjectBase::removeFile
(
const word& keyword,
const word& fieldName
const word& subDictName
)
{
dictionary dict;
state_.getObjectDict(functionObjectName_, fieldName, dict);
state_.getObjectDict(functionObjectName_, subDictName, dict);
fileName fName;
if (dict.readIfPresent(keyword, fName))
@ -65,15 +65,13 @@ Foam::fileName
Foam::functionObjects::runTimePostPro::functionObjectBase::getFileName
(
const word& keyword,
const word& fieldName
const word& subDictName
) const
{
dictionary dict;
state_.getObjectDict(functionObjectName_, fieldName, dict);
state_.getObjectDict(functionObjectName_, subDictName, dict);
fileName fName(dict.lookupOrDefault(keyword, fileName::null));
return fName;
return dict.lookupOrDefault<fileName>(keyword, fileName::null);
}
@ -88,11 +86,9 @@ Foam::functionObjects::runTimePostPro::functionObjectBase::functionObjectBase
:
fieldVisualisationBase(dict, colours),
state_(state),
functionObjectName_(""),
functionObjectName_(dict.lookup("functionObject")),
clearObjects_(dict.lookupOrDefault("clearObjects", false))
{
dict.lookup("functionObject") >> functionObjectName_;
}
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //