diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 901eb0396c574d4c6eabe115d9f8ca3fe81d88a2..3c514f7bcf48fcb781c22582ea0a1f29c2be41bd 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -122,7 +122,7 @@ public: ReactingCloud<ParcelType>& cloud_; //- Interpolator for continuous phase pressure field - const interpolation<scalar>& pInterp_; + autoPtr<interpolation<scalar> > pInterp_; public: diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index 8878dd29ed88a7a78ee9b4df421940390be852b5..d04fb34467633d5dd27fe457f65acc898ba5f7dc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -170,7 +170,7 @@ template<class ParcelType> inline const Foam::interpolation<Foam::scalar>& Foam::ReactingParcel<ParcelType>::trackData::pInterp() const { - return pInterp_; + return pInterp_(); } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index 09ca7444c6b4ab61020f09ac1a29c0692531f9d7..db92c15297f671f6059cd185fa99f058ad049e0e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -138,7 +138,7 @@ public: //- Reference to the cloud containing this particle ThermoCloud<ParcelType>& cloud_; - //- Local copy of specific heat field + //- Local copy of carrier specific heat field // Cp not stored on acrrier thermo, but returned as tmp<...> const volScalarField Cp_; @@ -149,7 +149,7 @@ public: autoPtr<interpolation<scalar> > TInterp_; //- Specific heat capacity field interpolator - const interpolation<scalar>& CpInterp_; + autoPtr<interpolation<scalar> > CpInterp_; public: @@ -170,6 +170,9 @@ public: //- Return access to the owner cloud inline ThermoCloud<ParcelType>& cloud(); + //- Return access to the locally stored carrier Cp field + inline const volScalarField& Cp() const; + //- Return const access to the interpolator for continuous // phase temperature field inline const interpolation<scalar>& TInterp() const; diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index 76108f2b27a463aecb1a5444fe5c6005b821bc9e..5dabb761279d32d22f4b09b0153e0059222c5fc8 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -202,6 +202,14 @@ Foam::ThermoParcel<ParcelType>::trackData::cloud() } +template<class ParcelType> +inline const Foam::volScalarField& +Foam::ThermoParcel<ParcelType>::trackData::Cp() const +{ + return Cp_; +} + + template<class ParcelType> inline const Foam::interpolation<Foam::scalar>& Foam::ThermoParcel<ParcelType>::trackData::TInterp() const @@ -214,7 +222,7 @@ template<class ParcelType> inline const Foam::interpolation<Foam::scalar>& Foam::ThermoParcel<ParcelType>::trackData::CpInterp() const { - return CpInterp_; + return CpInterp_(); }