From 5b7188afc98d33dbd37c6554e880c28d26beffea Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 2 Mar 2009 17:12:05 +0000
Subject: [PATCH] added Lvap + re-arranged constant properties
---
.../ReactingMultiphaseParcel.H | 12 --------
.../ReactingMultiphaseParcelI.H | 18 ------------
.../Templates/ReactingParcel/ReactingParcel.H | 18 ++++++++++++
.../ReactingParcel/ReactingParcelI.H | 29 ++++++++++++++++++-
4 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 416dc63d8bc..a0d9ea528f3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -76,12 +76,6 @@ public:
{
// Private data
- //- Vapourisation temperature [K]
- const scalar Tvap_;
-
- //- Boiling point [K]
- const scalar Tbp_;
-
//- Latent heat of devolatilisation [J/kg]
const scalar Ldevol_;
@@ -93,12 +87,6 @@ public:
// Access
- //- Return const access to the vapourisation temperature
- inline scalar Tvap() const;
-
- //- Return const access to the boiling point
- inline scalar Tbp() const;
-
//- Return const access to the latent heat of devolatilisation
inline scalar Ldevol() const;
};
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 7becf84d6cd..a87ad6032b9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -34,8 +34,6 @@ constantProperties
)
:
ReactingParcel<ParcelType>::constantProperties(dict),
- Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
- Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value())
{}
@@ -108,22 +106,6 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Tvap() const
-{
- return Tvap_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Tbp() const
-{
- return Tbp_;
-}
-
-
template<class ParcelType>
inline Foam::scalar
Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Ldevol() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 194ffc2d386..a4e19fbbae1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -83,6 +83,15 @@ public:
//- Constant volume flag - e.g. during mass transfer
Switch constantVolume_;
+ //- Boiling point [K]
+ const scalar Tbp_;
+
+ //- Vapourisation temperature [K]
+ const scalar Tvap_;
+
+ //- Latent heat of vaporisation [J/kg]
+ const scalar Lvap_;
+
public:
@@ -93,6 +102,15 @@ public:
//- Return const access to the constant volume flag
inline Switch constantVolume() const;
+
+ //- Return const access to the boiling point
+ inline scalar Tbp() const;
+
+ //- Return const access to the vapourisation temperature
+ inline scalar Tvap() const;
+
+ //- Return const access to the latent heat of vaporisation
+ inline scalar Lvap() const;
};
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 1a5950b332c..5e8c48025e3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -33,7 +33,10 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
)
:
ThermoParcel<ParcelType>::constantProperties(dict),
- constantVolume_(dict.lookup("constantVolume"))
+ constantVolume_(dict.lookup("constantVolume")),
+ Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
+ Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
+ Lvap_(dimensionedScalar(dict.lookup("Lvap")).value())
{}
@@ -112,6 +115,30 @@ Foam::ReactingParcel<ParcelType>::constantProperties::constantVolume() const
}
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
+{
+ return Tbp_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
+{
+ return Tvap_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Lvap() const
+{
+ return Lvap_;
+}
+
+
// * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * //
template<class ParcelType>
--
GitLab