From 841b303a33f1d59f04c9df4ca80456536d14b245 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 30 Apr 2015 11:11:35 +0100
Subject: [PATCH] DispersionRASModel: Updated lookup of the turbulence model
 Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1679

---
 .../DispersionRASModel/DispersionRASModel.C   | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index e34759e3ed..63881bb1e6 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))
+    if (obr.foundObject<turbulenceModel>(turbName))
     {
-        const compressible::turbulenceModel& model =
-            obr.lookupObject<compressible::turbulenceModel>(turbName);
-        return model.k();
-    }
-    else if (obr.foundObject<incompressible::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))
+    if (obr.foundObject<turbulenceModel>(turbName))
     {
-        const compressible::turbulenceModel& model =
-            obr.lookupObject<compressible::turbulenceModel>(turbName);
-        return model.epsilon();
-    }
-    else if (obr.foundObject<incompressible::turbulenceModel>(turbName))
-    {
-        const incompressible::turbulenceModel& model =
-            obr.lookupObject<incompressible::turbulenceModel>(turbName);
+        const turbulenceModel& model =
+            obr.lookupObject<turbulenceModel>(turbName);
         return model.epsilon();
     }
     else