Skip to content
GitLab
Commit 4ae925db authored by Andrew Heather's avatar Andrew Heather
Browse files

ENH: Updated particle surface thermo props

parent a843d76a
Hide whitespace changes
Inline Side-by-side
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
View file @ 4ae925db
......@@ -228,12 +228,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
// Calc surface values
// ~~~~~~~~~~~~~~~~~~~
scalar Ts, rhos, mus, Pr, kappa;
scalar Ts, rhos, mus, Prs, kappas;
ThermoParcel<ParcelType>::
calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappa);
calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Prs, kappas);
// Reynolds number
scalar Re = this->Re(U0, d0, rhos, mus);
scalar Res = this->Re(U0, d0, rhos, mus);
// Sources
......@@ -273,7 +273,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
td,
dt,
cellI,
Re,
Res,
Ts,
mus/rhos,
d0,
......@@ -316,7 +316,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
);
// Correct surface values due to emitted species
this->correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Pr, kappa);
this->correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
Res = this->Re(U0, d0, rhos, mus);
// Surface reactions
......@@ -374,9 +375,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
td,
dt,
cellI,
Re,
Pr,
kappa,
Res,
Prs,
kappas,
d0,
rho0,
T0,
......@@ -399,7 +400,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
td,
dt,
cellI,
Re,
Res,
mus,
d0,
U0,
......
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View file @ 4ae925db
......@@ -130,8 +130,8 @@ void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
const scalarField& Cs,
scalar& rhos,
scalar& mus,
scalar& Pr,
scalar& kappa
scalar& Prs,
scalar& kappas
)
{
// No correction if total concentration of emitted species is small
......@@ -177,7 +177,7 @@ void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
rhos = 0;
mus = 0;
kappa = 0;
kappas = 0;
scalar Cps = 0;
scalar sumYiSqrtW = 0;
scalar sumYiCbrtW = 0;
......@@ -190,7 +190,7 @@ void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
rhos += Xs[i]*W;
mus += Ys[i]*sqrtW*thermo.carrier().mu(i, T);
kappa += Ys[i]*cbrtW*thermo.carrier().kappa(i, T);
kappas += Ys[i]*cbrtW*thermo.carrier().kappa(i, T);
Cps += Xs[i]*thermo.carrier().Cp(i, T);
sumYiSqrtW += Ys[i]*sqrtW;
......@@ -199,8 +199,8 @@ void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
rhos *= pc_/(specie::RR*T);
mus /= sumYiSqrtW;
kappa /= sumYiCbrtW;
Pr = Cps*mus/kappa;
kappas /= sumYiCbrtW;
Prs = Cps*mus/kappas;
}
......@@ -252,11 +252,11 @@ void Foam::ReactingParcel<ParcelType>::calc
// Calc surface values
// ~~~~~~~~~~~~~~~~~~~
scalar Ts, rhos, mus, Pr, kappa;
this->calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappa);
scalar Ts, rhos, mus, Prs, kappas;
this->calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Prs, kappas);
// Reynolds number
scalar Re = this->Re(U0, d0, rhos, mus);
scalar Res = this->Re(U0, d0, rhos, mus);
// Sources
......@@ -296,7 +296,7 @@ void Foam::ReactingParcel<ParcelType>::calc
td,
dt,
cellI,
Re,
Res,
Ts,
mus/rhos,
d0,
......@@ -313,7 +313,8 @@ void Foam::ReactingParcel<ParcelType>::calc
);
// Correct surface values due to emitted species
correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Pr, kappa);
correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
Res = this->Re(U0, d0, rhos, mus);
// Update particle component mass and mass fractions
scalar mass1 = updateMassFraction(mass0, dMassPC, Y_);
......@@ -330,9 +331,9 @@ void Foam::ReactingParcel<ParcelType>::calc
td,
dt,
cellI,
Re,
Pr,
kappa,
Res,
Prs,
kappas,
d0,
rho0,
T0,
......@@ -355,7 +356,7 @@ void Foam::ReactingParcel<ParcelType>::calc
td,
dt,
cellI,
Re,
Res,
mus,
d0,
U0,
......
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
View file @ 4ae925db
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -358,8 +358,8 @@ public:
const scalarField& Cs,
scalar& rhos,
scalar& mus,
scalar& Pr,
scalar& kappa
scalar& Prs,
scalar& kappas
);
//- Update parcel properties over the time interval
......
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
View file @ 4ae925db
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -108,7 +108,7 @@ void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
scalar& rhos,
scalar& mus,
scalar& Pr,
scalar& kappa
scalar& kappas
) const
{
// Surface temperature using two thirds rule
......@@ -144,7 +144,7 @@ void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
mus = td.muInterp().interpolate(this->position(), tetIs)/TRatio;
Pr = td.cloud().constProps().Pr();
kappa = Cpc_*mus/Pr;
kappas = Cpc_*mus/Pr;
}
......@@ -170,8 +170,8 @@ void Foam::ThermoParcel<ParcelType>::calc
// Calc surface values
// ~~~~~~~~~~~~~~~~~~~
scalar Ts, rhos, mus, Pr, kappa;
calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappa);
scalar Ts, rhos, mus, Pr, kappas;
calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappas);
// Reynolds number
scalar Re = this->Re(U0, d0, rhos, mus);
......@@ -209,7 +209,7 @@ void Foam::ThermoParcel<ParcelType>::calc
cellI,
Re,
Pr,
kappa,
kappas,
d0,
rho0,
T0,
......
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
View file @ 4ae925db
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -381,7 +381,7 @@ public:
scalar& rhos,
scalar& mus,
scalar& Pr,
scalar& kappa
scalar& kappas
) const;
//- Update parcel properties over the time interval
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment