momentumTransportModel, twoPhaseMixture: Updated for clang
The use of move semantics differs between gcc and clang requiring a different approach when returning a registered IOdictionary
This commit is contained in:
@ -38,7 +38,8 @@ namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
|
||||
|
||||
Foam::IOdictionary Foam::momentumTransportModel::readModelDict
|
||||
Foam::typeIOobject<Foam::IOdictionary>
|
||||
Foam::momentumTransportModel::readModelDict
|
||||
(
|
||||
const objectRegistry& obr,
|
||||
const word& group,
|
||||
|
||||
@ -79,7 +79,7 @@ protected:
|
||||
|
||||
// Protected member functions
|
||||
|
||||
static IOdictionary readModelDict
|
||||
static typeIOobject<IOdictionary> readModelDict
|
||||
(
|
||||
const objectRegistry& obr,
|
||||
const word& group,
|
||||
|
||||
@ -40,10 +40,13 @@ inline Foam::autoPtr<MomentumTransportModel> Foam::momentumTransportModel::New
|
||||
{
|
||||
const word modelType
|
||||
(
|
||||
momentumTransportModel::readModelDict
|
||||
IOdictionary
|
||||
(
|
||||
U.db(),
|
||||
alphaRhoPhi.group()
|
||||
momentumTransportModel::readModelDict
|
||||
(
|
||||
U.db(),
|
||||
alphaRhoPhi.group()
|
||||
)
|
||||
).lookup("simulationType")
|
||||
);
|
||||
|
||||
|
||||
@ -35,7 +35,8 @@ namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * //
|
||||
|
||||
Foam::IOdictionary Foam::twoPhaseMixture::readPhasePropertiesDict
|
||||
Foam::typeIOobject<Foam::IOdictionary>
|
||||
Foam::twoPhaseMixture::readPhasePropertiesDict
|
||||
(
|
||||
const objectRegistry& obr
|
||||
)
|
||||
|
||||
@ -62,7 +62,7 @@ class twoPhaseMixture
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
static IOdictionary readPhasePropertiesDict
|
||||
static typeIOobject<IOdictionary> readPhasePropertiesDict
|
||||
(
|
||||
const objectRegistry& obr
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user