From 5f7c84e2275a9dc8713453dcac332703995e97a4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 7 Aug 2015 16:16:12 +0100
Subject: [PATCH] Compressible solver: correct initial Courant-number
 calculation Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1816

---
 .../rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C         | 2 +-
 .../compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C        | 2 +-
 .../solvers/multiphase/cavitatingFoam/setInitialDeltaT.H      | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index fcfc2aa7..b47cb492 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "createPcorrTypes.H"
     #include "createRhoUf.H"
-    #include "CourantNo.H"
+    #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index 5a8e0b92..c4a14555 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "createPcorrTypes.H"
     #include "createRhoUf.H"
-    #include "CourantNo.H"
+    #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
index c452d069..52c04603 100644
--- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.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
@@ -32,8 +32,6 @@ Description
 
 if (adjustTimeStep)
 {
-#   include "CourantNo.H"
-
     if (CoNum > SMALL)
     {
         scalar maxDeltaTFact =