From 766b204eae23896ff45e593c31b4a3887f92fefc Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 27 Apr 2014 23:06:39 +0100
Subject: [PATCH 1/3] subCycleTime: added access to cycle index

---
 src/OpenFOAM/db/Time/subCycleTime.H | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/Time/subCycleTime.H b/src/OpenFOAM/db/Time/subCycleTime.H
index 594ee56e..9bec0326 100644
--- a/src/OpenFOAM/db/Time/subCycleTime.H
+++ b/src/OpenFOAM/db/Time/subCycleTime.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,6 +75,18 @@ public:
         //- End the sub-cycling and reset the time-state
         void endSubCycle();
 
+        //- Return the total number of sub-cycles
+        label nSubCycles() const
+        {
+            return nSubCycles_;
+        }
+
+        //- Return the current sub-cycle index
+        label index() const
+        {
+            return subCycleIndex_;
+        }
+
 
     // Member operators
 

From a7782f7327d499f62d06e0e47b730f2e79ba5b5e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 27 Apr 2014 23:07:07 +0100
Subject: [PATCH 2/3] TurbulenceModels/turbulenceModels/laminar: Corrected name
 of nuEff for multiphase

---
 .../turbulenceModels/laminar/laminar.C            | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
index c2799e5c..eac733d4 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::laminar<BasicTurbulenceModel>::laminar
     const alphaField& alpha,
     const rhoField& rho,
     const volVectorField& U,
-    const surfaceScalarField& alphaPhi,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
     const word& propertiesName
@@ -49,7 +49,7 @@ Foam::laminar<BasicTurbulenceModel>::laminar
         alpha,
         rho,
         U,
-        alphaPhi,
+        alphaRhoPhi,
         phi,
         transport,
         propertiesName
@@ -66,7 +66,7 @@ Foam::laminar<BasicTurbulenceModel>::New
     const alphaField& alpha,
     const rhoField& rho,
     const volVectorField& U,
-    const surfaceScalarField& alphaPhi,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
     const word& propertiesName
@@ -79,7 +79,7 @@ Foam::laminar<BasicTurbulenceModel>::New
             alpha,
             rho,
             U,
-            alphaPhi,
+            alphaRhoPhi,
             phi,
             transport,
             propertiesName
@@ -141,7 +141,10 @@ Foam::laminar<BasicTurbulenceModel>::nuEff() const
 {
     return tmp<volScalarField>
     (
-        new volScalarField("nuEff", this->nu())
+        new volScalarField
+        (
+            IOobject::groupName("nuEff", this->U_.group()), this->nu()
+        )
     );
 }
 

From f9032755f3e93988a8138d2231d5fb3adb28c0d4 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 27 Apr 2014 23:07:33 +0100
Subject: [PATCH 3/3] Corrected message

---
 .../gaussConvectionScheme/gaussConvectionScheme.H               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
index a3ce0d1e..37761441 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
@@ -125,7 +125,7 @@ public:
                        "steady-state solver, use 'bounded Gauss' "
                        "to ensure boundedness.\n"
                     << "    To remove this warning switch off "
-                    << "'boundedGauss' in "
+                    << "'warnUnboundedGauss' in "
                     << controlDictFiles[controlDictFiles.size()-1]
                     << endl;
             }