diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C index e34759e3ed1689abcf91cc6b957801bf29a2dd7e..63881bb1e6e77bab481fbae108092bb4e87ca55a 100644 --- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C +++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C @@ -25,8 +25,7 @@ License #include "DispersionRASModel.H" #include "demandDrivenData.H" -#include "turbulentTransportModel.H" -#include "turbulentFluidThermoModel.H" +#include "turbulenceModel.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -35,18 +34,17 @@ Foam::tmp<Foam::volScalarField> Foam::DispersionRASModel<CloudType>::kModel() const { const objectRegistry& obr = this->owner().mesh(); - const word turbName = turbulenceModel::propertiesName; + const word turbName = + IOobject::groupName + ( + turbulenceModel::propertiesName, + this->owner().U().group() + ); - if (obr.foundObject<compressible::turbulenceModel>(turbName)) - { - const compressible::turbulenceModel& model = - obr.lookupObject<compressible::turbulenceModel>(turbName); - return model.k(); - } - else if (obr.foundObject<incompressible::turbulenceModel>(turbName)) + if (obr.foundObject<turbulenceModel>(turbName)) { - const incompressible::turbulenceModel& model = - obr.lookupObject<incompressible::turbulenceModel>(turbName); + const turbulenceModel& model = + obr.lookupObject<turbulenceModel>(turbName); return model.k(); } else @@ -70,18 +68,17 @@ Foam::tmp<Foam::volScalarField> Foam::DispersionRASModel<CloudType>::epsilonModel() const { const objectRegistry& obr = this->owner().mesh(); - const word turbName = turbulenceModel::propertiesName; + const word turbName = + IOobject::groupName + ( + turbulenceModel::propertiesName, + this->owner().U().group() + ); - if (obr.foundObject<compressible::turbulenceModel>(turbName)) - { - const compressible::turbulenceModel& model = - obr.lookupObject<compressible::turbulenceModel>(turbName); - return model.epsilon(); - } - else if (obr.foundObject<incompressible::turbulenceModel>(turbName)) + if (obr.foundObject<turbulenceModel>(turbName)) { - const incompressible::turbulenceModel& model = - obr.lookupObject<incompressible::turbulenceModel>(turbName); + const turbulenceModel& model = + obr.lookupObject<turbulenceModel>(turbName); return model.epsilon(); } else