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: improve dynamicCode consistency

Browse Source 
- refactor and provision for additional code context
This commit is contained in:
Mark Olesen
2021-04-01 10:50:38 +02:00
committed by Andrew Heather
parent 2b7b3700c2
commit cf9063878e
23 changed files with 605 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
View File

@ -27,11 +27,11 @@ License
\*---------------------------------------------------------------------------*/
#include "codeStream.H"
#include "addToMemberFunctionSelectionTable.H"
#include "StringStream.H"
#include "dynamicCode.H"
#include "dynamicCodeContext.H"
#include "StringStream.H"
#include "Time.H"
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -69,11 +69,7 @@ Foam::dlLibraryTable& Foam::functionEntries::codeStream::libs
const dictionary& dict
)
{
const baseIOdictionary& d = static_cast<const baseIOdictionary&>
(
dict.topDict()
);
return d.time().libs();
return static_cast<const baseIOdictionary&>(dict.topDict()).time().libs();
}
@ -82,28 +78,27 @@ bool Foam::functionEntries::codeStream::doingMasterOnlyReading
const dictionary& dict
)
{
const dictionary& topDict = dict.topDict();
// Fallback value
bool masterOnly = regIOobject::masterOnlyReading;
if (isA<baseIOdictionary>(topDict))
const auto* iodictPtr = isA<baseIOdictionary>(dict.topDict());
if (iodictPtr)
{
const baseIOdictionary& d = static_cast<const baseIOdictionary&>
(
topDict
);
masterOnly = iodictPtr->globalObject();
DebugPout
<< "codeStream : baseIOdictionary:" << dict.name()
<< " master-only-reading:" << d.globalObject() << endl;
return d.globalObject();
<< " master-only-reading:" << masterOnly << endl;
}
else
{
DebugPout
<< "codeStream : not a baseIOdictionary:" << dict.name()
<< " master-only-reading:" << masterOnly << endl;
}
DebugPout
<< "codeStream : not a baseIOdictionary:" << dict.name()
<< " master-only-reading:" << regIOobject::masterOnlyReading << endl;
// Fall back to regIOobject::masterOnlyReading
return regIOobject::masterOnlyReading;
return masterOnly;
}