From bf1012a798d391eeccea5d76baf791f69df649b3 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 15 Jun 2012 14:51:59 +0100
Subject: [PATCH] ENH: PaSR model improvements
---
src/combustionModels/PaSR/PaSR.C | 19 ++++---------------
src/combustionModels/PaSR/PaSR.H | 2 +-
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C
index 16720de35b9..e6b1123d8f0 100644
--- a/src/combustionModels/PaSR/PaSR.C
+++ b/src/combustionModels/PaSR/PaSR.C
@@ -25,7 +25,6 @@ License
#include "PaSR.H"
#include "fvmSup.H"
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class CombThermoType>
@@ -36,18 +35,17 @@ Foam::combustionModels::PaSR<CombThermoType>::PaSR
)
:
CombThermoType(modelType, mesh),
- Cmix_(this->coeffs().lookup("Cmix")),
+ Cmix_(readScalar(this->coeffs().lookup("Cmix"))),
turbulentReaction_(this->coeffs().lookup("turbulentReaction")),
kappa_
(
IOobject
(
- "kappa",
+ "PaSR::kappa",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::AUTO_WRITE,
- false
+ IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("kappa", dimless, 0.0)
@@ -70,7 +68,6 @@ Foam::combustionModels::PaSR<CombThermoType>::~PaSR()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
template<class CombThermoType>
Foam::tmp<Foam::volScalarField>
Foam::combustionModels::PaSR<CombThermoType>::tc() const
@@ -108,20 +105,12 @@ void Foam::combustionModels::PaSR<CombThermoType>::correct()
tmp<volScalarField> ttc(tc());
const volScalarField& tc = ttc();
- const dimensionedScalar e0
- (
- "e0",
- sqr(dimLength)/pow3(dimTime),
- SMALL
- );
-
forAll(epsilon, i)
{
if (epsilon[i] > 0)
{
scalar tk =
- Cmix_.value()
- *Foam::sqrt(muEff[i]/rho[i]/(epsilon[i] + e0.value()));
+ Cmix_*Foam::sqrt(muEff[i]/rho[i]/(epsilon[i] + SMALL));
// Chalmers PaSR model
if (!useReactionRate_)
diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H
index 125c9182c6c..b351d8c7057 100644
--- a/src/combustionModels/PaSR/PaSR.H
+++ b/src/combustionModels/PaSR/PaSR.H
@@ -55,7 +55,7 @@ class PaSR
// Private data
//- Mixing constant
- dimensionedScalar Cmix_;
+ scalar Cmix_;
//- Turbulent reaction switch
Switch turbulentReaction_;
--
GitLab