diff --git a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C index e9b853fdcb..30a0b4545e 100644 --- a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C @@ -38,7 +38,8 @@ namespace Foam // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -Foam::IOdictionary Foam::momentumTransportModel::readModelDict +Foam::typeIOobject +Foam::momentumTransportModel::readModelDict ( const objectRegistry& obr, const word& group, diff --git a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H index 57bf5e55cf..db60177988 100644 --- a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H @@ -79,7 +79,7 @@ protected: // Protected member functions - static IOdictionary readModelDict + static typeIOobject readModelDict ( const objectRegistry& obr, const word& group, diff --git a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModelTemplates.C b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModelTemplates.C index dd18d2ab5e..846e57c3aa 100644 --- a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModelTemplates.C +++ b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModelTemplates.C @@ -40,10 +40,13 @@ inline Foam::autoPtr Foam::momentumTransportModel::New { const word modelType ( - momentumTransportModel::readModelDict + IOdictionary ( - U.db(), - alphaRhoPhi.group() + momentumTransportModel::readModelDict + ( + U.db(), + alphaRhoPhi.group() + ) ).lookup("simulationType") ); diff --git a/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C b/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C index dfed23d250..da0eae7328 100644 --- a/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C +++ b/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C @@ -35,7 +35,8 @@ namespace Foam // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * // -Foam::IOdictionary Foam::twoPhaseMixture::readPhasePropertiesDict +Foam::typeIOobject +Foam::twoPhaseMixture::readPhasePropertiesDict ( const objectRegistry& obr ) diff --git a/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H b/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H index 7fe794aa5a..c1292bd9b1 100644 --- a/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H +++ b/src/twoPhaseModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H @@ -62,7 +62,7 @@ class twoPhaseMixture // Private Member Functions - static IOdictionary readPhasePropertiesDict + static typeIOobject readPhasePropertiesDict ( const objectRegistry& obr );