From 0612c15134ef545ec57ed0a3245725470f2c0505 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Mar 2009 13:07:49 +0000
Subject: [PATCH] using scalarList for Y instead of scalarField
---
.../ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C | 2 +-
.../parcels/Templates/ReactingParcel/ReactingParcel.H | 6 +++---
.../parcels/Templates/ReactingParcel/ReactingParcelI.H | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 61513ae7830..9756082ae84 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -68,7 +68,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
}
// scale the mass fractions
- const scalarField& YMix = this->Y_;
+ const scalarList& YMix = this->Y_;
YGas_ /= YMix[0] + ROOTVSMALL;
YLiquid_ /= YMix[1] + ROOTVSMALL;
YSolid_ /= YMix[2] + ROOTVSMALL;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index cde36a297dc..bc38527efb8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -169,7 +169,7 @@ protected:
scalar mass0_;
//- Mass fractions of mixture []
- scalarField Y_;
+ scalarList Y_;
// Cell-based quantities
@@ -250,7 +250,7 @@ public:
inline scalar mass0() const;
//- Return const access to mass fractions of mixture
- inline const scalarField& Y() const;
+ inline const scalarList& Y() const;
//- Return the owner cell pressure
inline scalar pc() const;
@@ -262,7 +262,7 @@ public:
inline scalar& mass0();
//- Return access to mass fractions of mixture
- inline scalarField& Y();
+ inline scalarList& Y();
// Main calculation loop
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 8c0d09e7578..aeb38c9c5ca 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -166,7 +166,7 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y() const
+inline const Foam::scalarList& Foam::ReactingParcel<ParcelType>::Y() const
{
return Y_;
}
@@ -187,7 +187,7 @@ inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y()
+inline Foam::scalarList& Foam::ReactingParcel<ParcelType>::Y()
{
return Y_;
}
--
GitLab