From 57d75a691f4787d80e6d17ea5148d60751f42d73 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 7 Jun 2015 18:51:36 +0100
Subject: [PATCH] combustionModel: Change the base turbulenceModel to
 compressibleTurbulenceModel to allow combustionModel to be used with more
 general forms of multi-phase

---
 .../combustionModel/combustionModel.H              |  6 +++---
 .../combustionModel/combustionModelI.H             | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
index 7c30881fd2..5368d1af80 100644
--- a/src/combustionModels/combustionModel/combustionModel.H
+++ b/src/combustionModels/combustionModel/combustionModel.H
@@ -65,7 +65,7 @@ protected:
     // Protected data
 
         //- Reference to the turbulence model
-        compressible::turbulenceModel* turbulencePtr_;
+        compressibleTurbulenceModel* turbulencePtr_;
 
         //- Reference to the mesh database
         const fvMesh& mesh_;
@@ -118,12 +118,12 @@ public:
             virtual tmp<volScalarField> rho() const = 0;
 
             //- Return access to turbulence
-            inline const compressible::turbulenceModel& turbulence() const;
+            inline const compressibleTurbulenceModel& turbulence() const;
 
             //- Set turbulence
             inline void setTurbulence
             (
-                compressible::turbulenceModel& turbModel
+                compressibleTurbulenceModel& turbModel
             );
 
             //- Is combustion active?
diff --git a/src/combustionModels/combustionModel/combustionModelI.H b/src/combustionModels/combustionModel/combustionModelI.H
index a4cb42aef0..6553155682 100644
--- a/src/combustionModels/combustionModel/combustionModelI.H
+++ b/src/combustionModels/combustionModel/combustionModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,11 +41,11 @@ inline const Foam::surfaceScalarField& Foam::combustionModel::phi() const
     {
         FatalErrorIn
         (
-            "const Foam::compressible::turbulenceModel& "
+            "const Foam::compressibleTurbulenceModel& "
             "Foam::combustionModel::turbulence() const "
         )   << "turbulencePtr_ is empty. Please use "
             << "combustionModel::setTurbulence "
-            << "(compressible::turbulenceModel& )"
+            << "(compressibleTurbulenceModel& )"
             << abort(FatalError);
 
         return turbulencePtr_->phi();
@@ -53,7 +53,7 @@ inline const Foam::surfaceScalarField& Foam::combustionModel::phi() const
 }
 
 
-inline const Foam::compressible::turbulenceModel&
+inline const Foam::compressibleTurbulenceModel&
 Foam::combustionModel::turbulence() const
 {
     if (turbulencePtr_)
@@ -64,11 +64,11 @@ Foam::combustionModel::turbulence() const
     {
         FatalErrorIn
         (
-            "const Foam::compressible::turbulenceModel& "
+            "const Foam::compressibleTurbulenceModel& "
             "Foam::combustionModel::turbulence() const "
         )   << "turbulencePtr_ is empty. Please use "
             << "combustionModel::setTurbulence "
-            << "(compressible::turbulenceModel& )"
+            << "(compressibleTurbulenceModel& )"
             << abort(FatalError);
 
         return *turbulencePtr_;
@@ -84,7 +84,7 @@ inline const Foam::Switch& Foam::combustionModel::active() const
 
 inline void Foam::combustionModel::setTurbulence
 (
-    compressible::turbulenceModel& turbModel
+    compressibleTurbulenceModel& turbModel
 )
 {
     turbulencePtr_ = &turbModel;