PaSR: Removed deprecated "turbulentReaction" switch

To run with laminar reaction rates choose the "laminar" combustion model rather
than setting "turbulentReaction no;" in the "PaSR" model.

src/combustionModels/PaSR/PaSR.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PaSR.H"
-#include "fvmSup.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -39,7 +38,6 @@ Foam::combustionModels::PaSR<Type>::PaSR
 :
     laminar<Type>(modelType, mesh, combustionProperties, phaseName),
     Cmix_(readScalar(this->coeffs().lookup("Cmix"))),
-    turbulentReaction_(this->coeffs().lookup("turbulentReaction")),
     kappa_
     (
         IOobject
@@ -72,35 +70,28 @@ void Foam::combustionModels::PaSR<Type>::correct()
     {
         laminar<Type>::correct();
 
-        if (turbulentReaction_)
+        tmp<volScalarField> tepsilon(this->turbulence().epsilon());
-        {
+        const scalarField& epsilon = tepsilon();
-            tmp<volScalarField> tepsilon(this->turbulence().epsilon());
+        tmp<volScalarField> tmuEff(this->turbulence().muEff());
-            const volScalarField& epsilon = tepsilon();
+        const scalarField& muEff = tmuEff();
-            tmp<volScalarField> tmuEff(this->turbulence().muEff());
+        tmp<volScalarField> ttc(this->tc());
-            const volScalarField& muEff = tmuEff();
+        const scalarField& tc = ttc();
-            tmp<volScalarField> ttc(this->tc());
+        tmp<volScalarField> trho(this->rho());
-            const volScalarField& tc = ttc();
+        const scalarField& rho = trho();
-            tmp<volScalarField> trho(this->rho());
-            const volScalarField& rho = trho();
 
-            forAll(epsilon, i)
+        forAll(epsilon, i)
+        {
+            const scalar tk =
+                Cmix_*sqrt(max(muEff[i]/rho[i]/(epsilon[i] + SMALL), 0));
+
+            if (tk > SMALL)
             {
-                scalar tk =
+                kappa_[i] = tc[i]/(tc[i] + tk);
-                    Cmix_*sqrt(max(muEff[i]/rho[i]/(epsilon[i] + SMALL), 0));
+            }
-
+            else
-                if (tk > SMALL)
+            {
-                {
+                kappa_[i] = 1.0;
-                    kappa_[i] = tc[i]/(tc[i] + tk);
-                }
-                else
-                {
-                    kappa_[i] = 1.0;
-                }
             }
-        }
-        else
-        {
-            kappa_ = 1.0;
         }
     }
 }
@@ -135,7 +126,6 @@ bool Foam::combustionModels::PaSR<Type>::read()
     if (laminar<Type>::read())
     {
         this->coeffs().lookup("Cmix") >> Cmix_;
-        this->coeffs().lookup("turbulentReaction") >> turbulentReaction_;
         return true;
     }
     else

src/combustionModels/PaSR/PaSR.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,9 +61,6 @@ class PaSR
         //- Mixing constant
         scalar Cmix_;
 
-        //- Turbulent reaction switch
-        Switch turbulentReaction_;
-
         //- Mixing parameter
         volScalarField kappa_;
 

src/combustionModels/laminar/laminar.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -170,8 +170,8 @@ bool Foam::combustionModels::laminar<Type>::read()
 {
     if (Type::read())
     {
-        this->coeffs().lookup("integrateReactionRate")
+        integrateReactionRate_ =
-            >> integrateReactionRate_;
+            this->coeffs().lookupOrDefault("integrateReactionRate", true);
         return true;
     }
     else

tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties

@@ -23,8 +23,6 @@ chemistryType
 
 chemistry       off;
 
-turbulentReaction off;
-
 initialChemicalTimeStep 1e-07;
 
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties

@@ -19,11 +19,9 @@ combustionModel  PaSR<psiChemistryCombustion>;
 
 active  true;
 
-
 PaSRCoeffs
 {
     Cmix                1.0;
-    turbulentReaction   on;
 }
 
 

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/combustionProperties

@@ -22,7 +22,6 @@ active  false;
 PaSRCoeffs
 {
     Cmix                1.0;
-    turbulentReaction   on;
 }
 
 

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<psiChemistryCombustion>;
+combustionModel  laminar<psiChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                1.0;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<psiChemistryCombustion>;
+combustionModel  laminar<psiChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                1.0;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<psiChemistryCombustion>;
+combustionModel  laminar<psiChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                1.0;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<rhoChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                1.0;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<rhoChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                1.0;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<rhoChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                1.0;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties

@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<rhoChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                0.1;
-    turbulentReaction   off;
-}
 
 
 // ************************************************************************* //

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties

@@ -15,15 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<rhoChemistryCombustion>;
+combustionModel laminar<rhoChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
+laminarCoeffs
-{
+{}
-    Cmix                0.1;
-    turbulentReaction   off;
-}
-
 
 // ************************************************************************* //

tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties

@@ -22,7 +22,6 @@ active          yes;
 PaSRCoeffs
 {
     Cmix                1.0;
-    turbulentReaction   yes;
 }
 
 

tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas

@@ -15,22 +15,19 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel    PaSR<rhoChemistryCombustion>;
+combustionModel PaSR<rhoChemistryCombustion>;
 
-active  true;
+active true;
 
 laminarCoeffs
-{
+{}
-}
 
 noCombustionCoeffs
-{
+{}
-}
 
 PaSRCoeffs
 {
     Cmix                1.0;
-    turbulentReaction   yes;
 }
 
 // ************************************************************************* //

tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/combustionProperties.gas

@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel    PaSR<rhoChemistryCombustion>;
+combustionModel PaSR<rhoChemistryCombustion>;
 
-active  false;
+active false;
 
 laminarCoeffs
 {}
@@ -28,7 +28,6 @@ noCombustionCoeffs
 PaSRCoeffs
 {
     Cmix                1.0;
-    turbulentReaction   yes;
 }
 
 // ************************************************************************* //

tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/combustionProperties.gas

@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel    PaSR<rhoChemistryCombustion>;
+combustionModel PaSR<rhoChemistryCombustion>;
 
-active  false;
+active false;
 
 laminarCoeffs
 {}
@@ -28,7 +28,6 @@ noCombustionCoeffs
 PaSRCoeffs
 {
     Cmix                1.0;
-    turbulentReaction   yes;
 }
 
 // ************************************************************************* //