diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C index 6bb51755d3..6358104a9b 100644 --- a/src/combustionModels/PaSR/PaSR.C +++ b/src/combustionModels/PaSR/PaSR.C @@ -42,14 +42,14 @@ Foam::combustionModels::PaSR::PaSR ( IOobject ( - IOobject::groupName("PaSR:kappa", phaseName), + IOobject::groupName(typeName + ":kappa", phaseName), mesh.time().timeName(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("kappa", dimless, 0.0) + dimensionedScalar("kappa", dimless, 0) ) {} @@ -72,10 +72,13 @@ void Foam::combustionModels::PaSR::correct() tmp tepsilon(this->turbulence().epsilon()); const scalarField& epsilon = tepsilon(); + tmp tmuEff(this->turbulence().muEff()); const scalarField& muEff = tmuEff(); + tmp ttc(this->tc()); const scalarField& tc = ttc(); + tmp trho(this->rho()); const scalarField& rho = trho(); @@ -113,7 +116,7 @@ Foam::combustionModels::PaSR::Qdot() const ( new volScalarField ( - IOobject::groupName("PaSR:dQ", this->phaseName_), + IOobject::groupName(typeName + ":Qdot", this->phaseName_), kappa_*laminar::Qdot() ) ); diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H index 067f788b97..480f4ce197 100644 --- a/src/combustionModels/PaSR/PaSR.H +++ b/src/combustionModels/PaSR/PaSR.H @@ -25,10 +25,11 @@ Class Foam::combustionModels::PaSR Description - Partially stirred reactor combustion model. The model calculates a finite - rate, based on both turbulence and chemistry time scales. Depending on - mesh resolution, the Cmix parameter can be used to scale the turbulence - mixing time scale. + Partially stirred reactor turbulent combustion model. + + This model calculates a finite rate, based on both turbulence and chemistry + time scales. Depending on mesh resolution, the Cmix parameter can be used + to scale the turbulence mixing time scale. SourceFiles PaSR.C diff --git a/src/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C index 190459f5ae..4101ed61ca 100644 --- a/src/combustionModels/noCombustion/noCombustion.C +++ b/src/combustionModels/noCombustion/noCombustion.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 @@ -52,9 +52,7 @@ Foam::combustionModels::noCombustion::~noCombustion() template void Foam::combustionModels::noCombustion::correct() -{ -// Do Nothing -} +{} template @@ -83,7 +81,7 @@ Foam::combustionModels::noCombustion::Qdot() const ( IOobject ( - IOobject::groupName("Qdot", this->phaseName_), + IOobject::groupName(typeName + ":Qdot", this->phaseName_), this->mesh().time().timeName(), this->mesh(), IOobject::NO_READ,