diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 76a80c0493d640df40d4cecef36d1d5b65043f18..98e357950d8c3e1a6ccc7610bae5bfe145c76f3e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -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,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 74a931c16acfafbf5299672a6b11d2bbb3210865..2c05144d9d3bf7c8bffa5ce03c9b6d9b2c76a461 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -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,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index e24049dc8c602472be59271dcccd8a4ce89d6525..d1eb1c586224aba38c18f1f3d02b1809b924c255 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -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
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index ba98abf666b588e897b4b232508804aee769bc2b..5769d77853f80843c9c8aa3147a4b1917b8db17e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -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,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 0267e7451a1dd1d7bbf07663101973c82c8c3988..8a954cb082cdce48c0d2353a289990b6e2eb126e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -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