From 670b158f17a7594f66b13f7cfb0d91535e0bcd65 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Thu, 27 Feb 2020 16:10:50 +0000
Subject: [PATCH] functionObjects::shearStress: Updated phase support

---
 .../field/shearStress/shearStress.C           | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/functionObjects/field/shearStress/shearStress.C b/src/functionObjects/field/shearStress/shearStress.C
index 7221bbfe97..bcd6c892a9 100644
--- a/src/functionObjects/field/shearStress/shearStress.C
+++ b/src/functionObjects/field/shearStress/shearStress.C
@@ -86,28 +86,34 @@ bool Foam::functionObjects::shearStress::execute()
 {
     const word fieldName(IOobject::groupName(type(), phaseName_));
 
-    typedef compressible::turbulenceModel cmpModel;
-    typedef incompressible::turbulenceModel icoModel;
+    typedef compressibleTurbulenceModel cmpModel;
+    typedef incompressibleTurbulenceModel icoModel;
 
-    if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
+    const word turbulenceModelName
+    (
+        IOobject::groupName(turbulenceModel::propertiesName, phaseName_)
+    );
+
+    if (mesh_.foundObject<cmpModel>(turbulenceModelName))
     {
         const cmpModel& model =
-            mesh_.lookupObject<cmpModel>(turbulenceModel::propertiesName);
+            mesh_.lookupObject<cmpModel>(turbulenceModelName);
 
         return store(fieldName, model.devRhoReff());
     }
-    else if (mesh_.foundObject<icoModel>(turbulenceModel::propertiesName))
+    else if (mesh_.foundObject<icoModel>(turbulenceModelName))
     {
         const icoModel& model =
-            mesh_.lookupObject<icoModel>(turbulenceModel::propertiesName);
+            mesh_.lookupObject<icoModel>(turbulenceModelName);
 
         return store(fieldName, model.devReff());
     }
     else
     {
         FatalErrorInFunction
-            << "Unable to find turbulence model in the "
-            << "database" << exit(FatalError);
+            << "Unable to find compressible turbulence model "
+            << turbulenceModelName << " in the database"
+            << exit(FatalError);
 
         return false;
     }