From 357042c801b4f29b991128e0563f554f46bf4d6b Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 14 Jun 2018 14:45:32 +0100
Subject: [PATCH] TUT: Updates for combustionModel = none.  See #867

---
 .../cylinder/constant/combustionProperties               | 9 +--------
 .../filter/constant/combustionProperties                 | 7 +------
 .../hotBoxes/constant/combustionProperties               | 7 +------
 .../parcelInBox/constant/combustionProperties            | 7 +------
 .../rivuletPanel/constant/combustionProperties           | 7 +------
 .../splashPanel/constant/combustionProperties            | 7 +------
 .../verticalChannel/constant/combustionProperties        | 7 +------
 .../verticalChannelLTS/constant/combustionProperties     | 7 +------
 .../verticalChannel/constant/combustionProperties        | 6 +-----
 .../mesh/parallel/filter/constant/combustionProperties   | 7 +------
 .../constant/combustionProperties                        | 6 +-----
 .../constant/combustionProperties                        | 6 +-----
 12 files changed, 12 insertions(+), 71 deletions(-)

diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
index 5632d4129d0..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
@@ -15,14 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR;
-
-active  false;
-
-PaSRCoeffs
-{
-    Cmix                1.0;
-}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
index d206bf3d7ba..f846ced203b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
index 7e65b2c249d..996deb04003 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -15,11 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel laminar;
+combustionModel none;
 
-active  false;
-
-laminarCoeffs
-{}
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/combustionProperties b/tutorials/mesh/parallel/filter/constant/combustionProperties
index 3d8f12afb40..f846ced203b 100644
--- a/tutorials/mesh/parallel/filter/constant/combustionProperties
+++ b/tutorials/mesh/parallel/filter/constant/combustionProperties
@@ -15,12 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<rhoChemistryCombustion>;
-
-active  false;
-
-laminarCoeffs
-{}
+combustionModel  none;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
index 4f1d97bf2b0..996deb04003 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
@@ -15,11 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel noCombustion<psiThermoCombustion>;
+combustionModel none;
 
-active          no;
-
-noCombustionCoeffs
-{}
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
index 4f1d97bf2b0..996deb04003 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
@@ -15,11 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel noCombustion<psiThermoCombustion>;
+combustionModel none;
 
-active          no;
-
-noCombustionCoeffs
-{}
 
 // ************************************************************************* //
-- 
GitLab