From 0cf3ae4fda9b16db7232b9ea7d8dbeeb44393f94 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 7 Aug 2015 15:55:46 +0100 Subject: [PATCH] Compressible solver: correct initial Courant-number calculation Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1816 --- applications/solvers/combustion/reactingFoam/reactingFoam.C | 2 +- .../rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C | 2 +- .../combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C | 2 +- .../rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 3 +-- .../solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C | 2 +- .../solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C | 2 +- .../solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C | 2 +- .../solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C | 2 +- .../solvers/multiphase/cavitatingFoam/setInitialDeltaT.H | 2 -- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index 2045c175fd..79deedb763 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) if (!LTS) { - #include "CourantNo.H" + #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" } diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index 743db29454..e8645bb47c 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) if (!LTS) { - #include "CourantNo.H" + #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" } diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index cdb1c64d56..6eb245028d 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) if (!LTS) { - #include "CourantNo.H" + #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" } diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C index 530d66ce5d..bd30b60a90 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C @@ -63,12 +63,11 @@ int main(int argc, char *argv[]) #include "createMRF.H" #include "createFvOptions.H" #include "createRhoUf.H" - #include "CourantNo.H" #include "createControls.H" if (!LTS) { - #include "CourantNo.H" + #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" } diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 5a54c9845f..382d041fd9 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) if (!LTS) { - #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 1fc630ca62..8d913919d2 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) #include "createMRF.H" #include "createFvOptions.H" #include "createRhoUf.H" - #include "CourantNo.H" + #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 99fc9feed1..3bfb2be776 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) if (!LTS) { - #include "CourantNo.H" + #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index e314d8b318..b3e758df12 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) if (!LTS) { - #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 b0516d1101..52c04603c4 100644 --- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H +++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H @@ -32,8 +32,6 @@ Description if (adjustTimeStep) { - #include "CourantNo.H" - if (CoNum > SMALL) { scalar maxDeltaTFact =